diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 9a6cb17bcc..240ca89567 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1276,6 +1276,10 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 			GAMESTATE->RestoreSelectedOptions();	// restore the edit and playback options
 		}
 		break;
+	case SM_GainFocus:
+		/* We do this ourself. */
+		SOUND->HandleSongTimer( false );
+		break;
 	}
 }