diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index d6f5b3256c..f4541c3859 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1380,6 +1380,10 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 	case SM_BackFromSongOptions:
 		// coming back from PlayerOptions or SongOptions
 		GAMESTATE->StoreSelectedOptions();
+
+		// stop any music that screen may have been playing
+		SOUND->StopMusic();
+
 		break;
 	case SM_BackFromInsertAttack:
 		{