diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 888489fd01..80eec63138 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2193,9 +2193,8 @@ wxTextCtrl::MSWHandleMessage(WXLRESULT *rc,
             HasFlag(wxTE_PROCESS_ENTER) &&
             wParam == VK_RETURN )
     {
-        ClickDefaultButtonIfPossible();
-
-        processed = true;
+        if ( ClickDefaultButtonIfPossible() )
+            processed = true;
     }
 
     switch ( nMsg )