diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 18713c609d..af70202eaa 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2334,6 +2334,9 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
 
 wxWindow::~wxWindow()
 {
+    if (g_focusWindow == this)
+        g_focusWindow = NULL;
+
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;
 
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 18713c609d..af70202eaa 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2334,6 +2334,9 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
 
 wxWindow::~wxWindow()
 {
+    if (g_focusWindow == this)
+        g_focusWindow = NULL;
+
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;