diff --git a/src/native/win32/context.c b/src/native/win32/context.c
index 69dfd068..8e550e89 100644
--- a/src/native/win32/context.c
+++ b/src/native/win32/context.c
@@ -130,8 +130,9 @@ HWND createWindow(LPCTSTR window_class_name, int x, int y, int width, int height
 		windowflags = WS_POPUP;
 	} else {
 		exstyle = WS_EX_APPWINDOW;
-		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_MINIMIZEBOX | WS_SYSMENU;
+		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU;
 	}
+	windowflags = windowflags | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 
 	// If we're not a fullscreen window, adjust the height to account for the
 	// height of the title bar (unless undecorated)
diff --git a/src/native/win32/org_lwjgl_opengl_Display.c b/src/native/win32/org_lwjgl_opengl_Display.c
index a12bcc49..9b1a75d9 100644
--- a/src/native/win32/org_lwjgl_opengl_Display.c
+++ b/src/native/win32/org_lwjgl_opengl_Display.c
@@ -383,8 +383,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_reshape(JNIEnv *env, j
 		windowflags = WS_POPUP;
 	} else {
 		exstyle = WS_EX_APPWINDOW;
-		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_MINIMIZEBOX | WS_SYSMENU;
+		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU;
 	}
+	windowflags = windowflags | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 	
 	// If we're not a fullscreen window, adjust the height to account for the
 	// height of the title bar: