diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c
index 50e50f56504..822629beefb 100644
--- a/reactos/lib/user32/windows/nonclient.c
+++ b/reactos/lib/user32/windows/nonclient.c
@@ -376,7 +376,7 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn)
    }
 
    /* Now the other bit of the frame */
-   if (Style & WS_CAPTION || ExStyle & WS_EX_DLGMODALFRAME)
+   if (Style & (WS_DLGFRAME | WS_BORDER) || ExStyle & WS_EX_DLGMODALFRAME)
    {
       DWORD Width = GetSystemMetrics(SM_CXBORDER);
       DWORD Height = GetSystemMetrics(SM_CYBORDER);