diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 6c1198f0e4..fa9acdc1ba 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -2487,7 +2487,7 @@ void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
         // wxPopupWindow implemenation on this platform is classified as
         // perfect, then we should be able to safely set focus to the popup
         // control.
-        // In wxUniv/x11 port, popup window neither generic top-level nor
+        // In x11 backend, popup window neither generic top-level nor
         // perfect native window. So shouldn't be set focus to the popup control
         // same in the OnPopupDismiss function.
 #if !defined(__WXX11__)
@@ -2517,10 +2517,7 @@ void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)
     // OnPopupDismisses.
     m_popupWinState = Hidden;
 
-#if !defined(__WXX11__)
-    SetFocus();
-#endif
-
+    //SetFocus();
     m_winPopup->Disable();
 
     // Inform popup control itself