diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index b6cc1c8408..b9ea640d6c 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -462,6 +462,9 @@ ScreenGameplay::ScreenGameplay()
 	LoadNextSong( true );
 
 
+	/* Keep the music playing after it's finished; we'll stop it. */
+	// XXX m_soundMusic.SetAutoStop(false);
+
 	if( GAMESTATE->m_bDemonstration )
 	{
 		m_StarWipe.SetOpened();