diff --git a/src/posix/cocoa/i_common.h b/src/posix/cocoa/i_common.h
index 545540b2f..7d7f82ac5 100644
--- a/src/posix/cocoa/i_common.h
+++ b/src/posix/cocoa/i_common.h
@@ -79,6 +79,7 @@ typedef float CGFloat;
 // From HIToolbox/Events.h
 enum
 {
+	kVK_ANSI_F        = 0x03,
 	kVK_Return        = 0x24,
 	kVK_Tab           = 0x30,
 	kVK_Space         = 0x31,
diff --git a/src/posix/cocoa/i_input.mm b/src/posix/cocoa/i_input.mm
index 5e0c5f1c8..3bbf42a9a 100644
--- a/src/posix/cocoa/i_input.mm
+++ b/src/posix/cocoa/i_input.mm
@@ -57,6 +57,8 @@ CVAR(Bool, use_mouse,    true,  CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, m_noprescale, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, m_filter,     false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
+CVAR(Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+
 CUSTOM_CVAR(Int, mouse_capturemode, 1, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
 {
 	if (self < 0)
@@ -542,6 +544,16 @@ void ProcessKeyboardEvent(NSEvent* theEvent)
 		return;
 	}
 
+	if (k_allowfullscreentoggle
+		&& (kVK_ANSI_F == keyCode)
+		&& (NSCommandKeyMask & [theEvent modifierFlags])
+		&& (NSKeyDown == [theEvent type])
+		&& ![theEvent isARepeat])
+	{
+		ToggleFullscreen = !ToggleFullscreen;
+		return;
+	}
+
 	if (GUICapture)
 	{
 		ProcessKeyboardEventInMenu(theEvent);