diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index ce58bfba04..28668c0424 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -819,6 +819,17 @@ ScreenEdit::~ScreenEdit()
 	m_soundMusic.StopPlaying();
 }
 
+void ScreenEdit::BeginScreen()
+{
+	/* We do this ourself. */
+	SOUND->HandleSongTimer( false );
+}
+
+void ScreenEdit::EndScreen()
+{
+	SOUND->HandleSongTimer( true );
+}
+
 // play assist ticks
 void ScreenEdit::PlayTicks()
 {
@@ -2581,9 +2592,6 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 	}
 	else if( SM == SM_GainFocus )
 	{
-		/* We do this ourself. */
-		SOUND->HandleSongTimer( false );
-
 		/* When another screen comes up, RageSounds takes over the sound timer.  When we come
 		 * back, put the timer back to where it was. */
 		GAMESTATE->m_fSongBeat = m_fTrailingBeat;
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index f88605cdc7..aeda726a27 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -165,6 +165,9 @@ class ScreenEdit : public ScreenWithMenuElements
 {
 public:
 	virtual void Init();
+	virtual void BeginScreen();
+	virtual void EndScreen();
+
 	virtual ~ScreenEdit();
 	virtual void Update( float fDeltaTime );
 	virtual void DrawPrimitives();