diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 43d9bd94..9cb175d6 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -613,6 +613,12 @@ int main( int argc, char **argv )
 	// Set the initial time base
 	Sys_Milliseconds( );
 
+#if MACOS_X
+	// This is passed if we are launched by double-clicking
+	if ( argc >= 2 && Q_strncmp ( argv[1], "-psn", 4 ) == 0 )
+		argc = 1;
+#endif
+
 	Sys_ParseArgs( argc, argv );
 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );