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