diff --git a/windows/win.c b/windows/win.c
index 7cdb36e28c8..c900f794b8c 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -1142,8 +1142,8 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
 
     /* Set the window menu */
 
-    if ((wndPtr->dwStyle & WS_CAPTION || wndPtr->dwExStyle & WS_EX_APPWINDOW)
-        && !( wndPtr->dwStyle & WS_CHILD) )
+    if (((wndPtr->dwStyle & (WS_CAPTION|WS_CHILD)) == WS_CAPTION) ||
+        (wndPtr->dwExStyle & WS_EX_APPWINDOW))
     {
         if (cs->hMenu) SetMenu(hwnd, cs->hMenu);
         else