diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index e2a0fd70c3..30b35a7dd0 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -461,7 +461,7 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
 {
     int keycode = event.GetKeyCode();
 
-    if ( keycode == WXK_TAB )
+    if ( keycode == WXK_TAB && !m_combo->IsPopupShown() )
     {
         wxNavigationKeyEvent evt;
         evt.SetFlags(wxNavigationKeyEvent::FromTab|