diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index da1e5bce82..0d66222326 100644
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -4763,7 +4763,8 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 wxCommandEvent event(wxEVT_TEXT_ENTER, GetId());
                 InitCommandEvent(event);
                 event.SetString(GetValue());
-                GetEventHandler()->ProcessEvent(event);
+                if( GetEventHandler()->ProcessEvent(event) )
+                    return;
             }
 
             if ( IsSingleLine() )