diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 50449b2344..03f2819b7b 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1833,7 +1833,10 @@ void wxComboCtrlBase::OnButtonClick()
 {
     // Derived classes can override this method for totally custom
     // popup action
-    ShowPopup();
+    if ( !IsPopupWindowState(Visible) )
+        ShowPopup();
+    else
+        HidePopup();
 }
 
 void wxComboCtrlBase::ShowPopup()