diff --git a/src/native/win32/org_lwjgl_Display.cpp b/src/native/win32/org_lwjgl_Display.cpp
index cd671ba0..fd6c44b5 100644
--- a/src/native/win32/org_lwjgl_Display.cpp
+++ b/src/native/win32/org_lwjgl_Display.cpp
@@ -305,7 +305,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_nCreate
 		windowflags = WS_POPUP | WS_VISIBLE;
 	} else {
 		exstyle = 0;
-		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_VISIBLE;
+		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_VISIBLE | WS_MINIMIZEBOX | WS_SYSMENU;
 	}
 	isFullscreen = fullscreen == JNI_TRUE;
 
@@ -342,6 +342,10 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_nCreate
 		 NULL);
 	env->ReleaseStringUTFChars(title, titleString);
 
+  // Disable close button
+  HMENU SysMen = GetSystemMenu(hwnd, false);
+  EnableMenuItem(SysMen, SC_CLOSE, MF_BYCOMMAND | MF_DISABLED);
+
 	// And we never look at windowClass again...
 
 	ShowWindow(hwnd, SW_SHOWNORMAL);