diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index e088336c4d..001ff1f48b 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1163,6 +1163,11 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 *exstyle |= WS_EX_DLGMODALFRAME;
                 break;
         }
+
+        if ( flags & wxTAB_TRAVERSAL )
+        {
+            *exstyle |= WS_EX_CONTROLPARENT;
+        }
     }
 
     return style;