diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index aadf2c1104..5f79ec30ef 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1770,13 +1770,13 @@ void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
         }
     }
 
-    event.StopPropagation();
-
     // For safety, completely re-create a new wxCommandEvent
     wxCommandEvent evt2(event);
     evt2.SetId(GetId());
     evt2.SetEventObject(this);
     HandleWindowEvent(evt2);
+
+    event.StopPropagation();
 }
 
 // call if cursor is on button area or mouse is captured for the button