diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 616fb42cb9..49af78fd53 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -826,7 +826,7 @@ void ScreenEdit::Update( float fDeltaTime )
 		if( GAMESTATE->m_fSongBeat > NoteRowToBeat(m_iStopPlayingAt) )
 		{
 			TransitionEditState( STATE_EDITING );
-			GAMESTATE->m_fSongBeat = NoteRowToBeat( m_NoteFieldEdit.m_iEndMarker );
+			GAMESTATE->m_fSongBeat = NoteRowToBeat( m_iStartPlayingAt );
 		}
 	}