diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 4a5626d85a..71fd444336 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1056,6 +1056,14 @@ int main(int argc, char* argv[])
 
 	SAFE_DELETE( pLoadingWindow );		// destroy this before init'ing Display
 
+	/* If the user has tried to quit during the loading, do it before creating the
+	 * main window. This prevents going to full screen just to quit. */
+	if( ArchHooks::UserQuit() )
+	{
+		ShutdownGame();
+		return 0;
+	}
+	
 	StartDisplay();
 
 	StoreActualGraphicOptions();