diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 51f28331ee..4c3b90575d 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -362,7 +362,8 @@ bool wxControlContainer::DoSetFocus()
         if ( win == m_winParent )
         {
             // our child already has focus, don't take it away from it
-            return TRUE;
+            m_inSetFocus = false;
+            return true;
         }
 
         if ( win->IsTopLevel() )