diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index b5e7a74725..78276c13ff 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -86,6 +86,10 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
 			m_iSelection[p] = 0;
 		}
 
+		m_PumpDifficultyCircle.Load( THEME->GetPathTo("Graphics","select music pump difficulty circle"));
+		m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
+		this->AddChild( &m_PumpDifficultyCircle );
+
 		m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","pump songselect difficulty") );
 		m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
 		this->AddChild(&m_PumpDifficultyRating);
diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h
index ad9127f977..3d25062d19 100644
--- a/stepmania/src/ScreenEz2SelectMusic.h
+++ b/stepmania/src/ScreenEz2SelectMusic.h
@@ -47,6 +47,7 @@ protected:
 	Sprite  m_ChoiceListHighlight;
 	Sprite  m_Guide;
 	Sprite				m_sprOptionsMessage;
+	Sprite  m_PumpDifficultyCircle;
 	BitmapText	m_PumpDifficultyRating;
 	MusicBannerWheel			m_MusicBannerWheel;
 	MenuElements		m_Menu;
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index be4c5e3909..db2fabb1f6 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -18,6 +18,7 @@
 #include "ThemeManager.h"
 #include "AnnouncerManager.h"
 
+#define SONGSEL_SCREEN				THEME->GetMetric("ScreenGameplay","SongSelectScreen")
 
 enum {
 	PO_SPEED = 0,
@@ -141,7 +142,7 @@ void ScreenPlayerOptions::GoToPrevState()
 		GAMESTATE->m_PlayMode == PLAY_MODE_ENDLESS)
 		SCREENMAN->SetNewScreen( "ScreenSelectCourse" );
 	else
-		SCREENMAN->SetNewScreen( "ScreenSelectMusic" );
+		SCREENMAN->SetNewScreen( SONGSEL_SCREEN );
 }
 
 void ScreenPlayerOptions::GoToNextState()