diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 7872678a64..a80bee3a53 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2614,9 +2614,10 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                         
                         evtCtx.SetEventObject(this);
                         if (GetEventHandler()->ProcessEvent(evtCtx))
+                        {
                             processed = true;
-                        else
-                            return MSWDefWindowProc(message, wParam, lParam);
+                            return true;
+                        }
                     }
                 }
 #endif