diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 09ee6779a5..3f9ea55fe8 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2058,6 +2058,12 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                                     // eat the Enter events sometimes
                                     return FALSE;
                                 }
+                                else if (!IsTopLevel())
+                                {
+                                    // if not a top level window, let parent
+                                    // handle it
+                                    return FALSE;
+                                }
                                 //else: treat Enter as TAB: pass to the next
                                 //      control as this is the best thing to do
                                 //      if the text doesn't handle Enter itself