diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 7b08367cdc..966d54257b 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -206,9 +206,6 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
 	if ([ this->window respondsToSelector:@selector(toggleFullScreen:) ]) {
 		[ this->window performSelector:@selector(toggleFullScreen:) withObject:this->window ];
 
-		/* Hide the menu bar and the dock */
-		[ NSMenu setMenuBarVisible:!full_screen ];
-
 		this->UpdateVideoModes();
 		InvalidateWindowClassesData(WC_GAME_OPTIONS, 3);
 		return true;
diff --git a/src/video/cocoa/cocoa_wnd.mm b/src/video/cocoa/cocoa_wnd.mm
index a36ef78dea..4cf6670b18 100644
--- a/src/video/cocoa/cocoa_wnd.mm
+++ b/src/video/cocoa/cocoa_wnd.mm
@@ -1288,7 +1288,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 /** Presentation options to use for full screen mode. */
 - (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
 {
-	return NSApplicationPresentationFullScreen | NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock;
+	return NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideMenuBar;
 }
 
 @end