diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 16f1ed9da8..969ace7bae 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -3328,7 +3328,9 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move)
 
 bool wxWindowBase::HasFocus() const
 {
-    return FindFocus() == this;
+    wxWindowBase* const win = DoFindFocus();
+    return win &&
+            (this == win || this == win->GetMainWindowOfCompositeControl());
 }
 
 // ----------------------------------------------------------------------------