diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 64ca4d1173..c9a50ffec0 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1789,7 +1789,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()