diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 5f3f015a7a..899e1a1f78 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -912,6 +912,14 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input )
 
 void ScreenSelectMusic::MenuBack( const InputEventPlus &input )
 {
+	if( TWO_PART_SELECTION && m_SelectionState == SelectionState_SelectingSteps )
+	{
+		m_SelectionState = SelectionState_SelectingSong;
+		// XXX: What sound should be played here?
+		SCREENMAN->PlayCancelSound();
+		return;
+	}
+
 	m_BackgroundLoader.Abort();
 
 	Cancel( SM_GoToPrevScreen );