diff --git a/src/native/macosx/org_lwjgl_opengl_Display.m b/src/native/macosx/org_lwjgl_opengl_Display.m
index 30cbf8d64..7878bfd8b 100644
--- a/src/native/macosx/org_lwjgl_opengl_Display.m
+++ b/src/native/macosx/org_lwjgl_opengl_Display.m
@@ -77,7 +77,11 @@ + (void) createWindow {
     // Inform the view of its parent window info;
 	[window_info->view setParent:window_info];
 	
-	[window_info->view setWantsBestResolutionOpenGLSurface:NO];
+	if (window_info->enableHighDPI && !window_info->fullscreen) {
+		[window_info->view setWantsBestResolutionOpenGLSurface:YES];
+	} else {
+		[window_info->view setWantsBestResolutionOpenGLSurface:NO];
+	}
 	
 	// set nsapp delegate for catching app quit events
 	[NSApp setDelegate:window_info->view];