diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 25ea9e30a1..e3ead3d4cd 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -68132,9 +68132,11 @@ public:
 
 	void inputAttemptWhenModal()
 	{
+		Component::SafePointer<Component> deletionChecker (this);
+
 		timerCallback();
 
-		if (! isOverAnyMenu())
+		if (deletionChecker != 0 && ! isOverAnyMenu())
 		{
 			if (componentAttachedTo != 0)
 			{
diff --git a/src/gui/components/menus/juce_PopupMenu.cpp b/src/gui/components/menus/juce_PopupMenu.cpp
index d2d6a387a2..adc10b98b6 100644
--- a/src/gui/components/menus/juce_PopupMenu.cpp
+++ b/src/gui/components/menus/juce_PopupMenu.cpp
@@ -549,9 +549,11 @@ public:
 
     void inputAttemptWhenModal()
     {
+        Component::SafePointer<Component> deletionChecker (this);
+
         timerCallback();
 
-        if (! isOverAnyMenu())
+        if (deletionChecker != 0 && ! isOverAnyMenu())
         {
             if (componentAttachedTo != 0)
             {