diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index d79cdde789..4f940936ad 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2619,6 +2619,24 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 			else
 				HandleMainMenuChoice( play_current_beat_to_end );
 
+			break;
+		case play_whole_song:
+			{
+				m_iStartPlayingAt = 0;
+				m_iStopPlayingAt = m_NoteDataEdit.GetLastRow();
+				m_iStopPlayingAt += BeatToNoteRow(4);		// give a one measure lead out
+
+				TransitionEditState( STATE_PLAYING );
+			}
+			break;
+		case play_current_beat_to_end:
+			{
+				m_iStartPlayingAt = BeatToNoteRow(GAMESTATE->m_fSongBeat);
+				m_iStopPlayingAt = m_NoteDataEdit.GetLastRow();
+				m_iStopPlayingAt += BeatToNoteRow(4);		// give a one measure lead out
+
+				TransitionEditState( STATE_PLAYING );
+			}
 			break;
 		case set_selection_start:
 			{
@@ -2679,24 +2697,6 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 				EditMiniMenu( &g_StepsInformation, SM_BackFromStepsInformation, SM_None );
 			}
 			break;
-		case play_whole_song:
-			{
-				m_iStartPlayingAt = 0;
-				m_iStopPlayingAt = m_NoteDataEdit.GetLastRow();
-				m_iStopPlayingAt += BeatToNoteRow(4);		// give a one measure lead out
-
-				TransitionEditState( STATE_PLAYING );
-			}
-			break;
-		case play_current_beat_to_end:
-			{
-				m_iStartPlayingAt = BeatToNoteRow(GAMESTATE->m_fSongBeat);
-				m_iStopPlayingAt = m_NoteDataEdit.GetLastRow();
-				m_iStopPlayingAt += BeatToNoteRow(4);		// give a one measure lead out
-
-				TransitionEditState( STATE_PLAYING );
-			}
-			break;
 		case save:
 		case save_on_exit:
 			{