diff --git a/include/wx/combo.h b/include/wx/combo.h
index d4840b1899..73ae300bb1 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -371,8 +371,8 @@ public:
     bool ShouldDrawFocus() const
     {
         const wxWindow* curFocus = FindFocus();
-        return ( !IsPopupShown() &&
-                 (curFocus == this || (m_btn && curFocus == m_btn)) &&
+        return ( IsPopupWindowState(Hidden) &&
+                 (curFocus == m_mainCtrlWnd || (m_btn && curFocus == m_btn)) &&
                  (m_windowStyle & wxCB_READONLY) );
     }