diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 51610f6391..00bc22aae5 100644
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -532,10 +532,21 @@ wxWindowMGL::~wxWindowMGL()
 
     if ( gs_mouseCapture == this )
         ReleaseMouse();
+
     if (gs_activeFrame == this)
+    {
+       // activate next frame in Z-order:
+       if ( m_wnd->prev )
+       {
+           wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
+           win->SetFocus();
+        }
         gs_activeFrame = NULL;
+    }
+    
     if ( gs_focusedWindow == this )
         KillFocus();
+
     if ( gs_windowUnderMouse == this )
         gs_windowUnderMouse = NULL;