diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 5e161cd3ab..91c11c01c1 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -61,6 +61,8 @@ public:
     // override some more virtuals
     virtual bool Show(bool show = TRUE);
 
+    virtual void RemoveChild( wxWindowBase *child );
+    
     // event handlers
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 9a699cfebc..7f82254fad 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -799,6 +799,13 @@ void wxFrame::OnActivate(wxActivateEvent& event)
     }
 }
 
+void wxFrame::RemoveChild( wxWindowBase *child )
+{
+    if ( child == m_winLastFocused )
+        m_winLastFocused = NULL;
+    wxFrameBase::RemoveChild(child);
+}
+
 // ----------------------------------------------------------------------------
 // tool/status bar stuff
 // ----------------------------------------------------------------------------