diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 948e88e8b3..108c6b6929 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2524,6 +2524,9 @@ wxWindowGTK::~wxWindowGTK()
     if (g_activeFrame == this)
         g_activeFrame = NULL;
 
+    if ( g_delayedFocus == this )
+        g_delayedFocus = NULL;
+
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;
 
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 948e88e8b3..108c6b6929 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2524,6 +2524,9 @@ wxWindowGTK::~wxWindowGTK()
     if (g_activeFrame == this)
         g_activeFrame = NULL;
 
+    if ( g_delayedFocus == this )
+        g_delayedFocus = NULL;
+
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;