diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index d5d0ee1bb9..27ff6cc238 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -119,7 +119,7 @@ PrefsManager::PrefsManager() :
 	m_fLifeDeltaPercentChangeNG			( Options, "LifeDeltaPercentChangeNG",			-0.080f ),
 	m_bShowCaution						( Options, "ShowCaution", true ),
 	m_bEventMode						( Options, "EventMode", false ),
-	m_iNumArcadeStages					( Options, "NumArcadeStages", 3 ),
+	m_iNumArcadeStages					( Options, "SongsPerPlay", 3 ),
 	m_fGlobalOffsetSeconds				( Options, "GlobalOffsetSeconds", 0 )
 {
 	Init();
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index 8beb7b662a..8dfd15193c 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -347,8 +347,11 @@ static void PremiumM( int &sel, bool ToSel, const ConfOption *pConfOption )
 
 static void SongsPerPlay( int &sel, bool ToSel, const ConfOption *pConfOption )
 {
+	IPreference *pPref = PREFSMAN->GetPreferenceByName( pConfOption->name );
+	ASSERT( pPref != NULL );
+
 	const float mapping[] = { 1,2,3,4,5,6,7 };
-	MoveMap( sel, PREFSMAN->m_iNumArcadeStages, ToSel, mapping, ARRAYSIZE(mapping) );
+	MoveMap( sel, *pPref, ToSel, mapping, ARRAYSIZE(mapping) );
 }
 static void SongsPerPlayOrEventMode( int &sel, bool ToSel, const ConfOption *pConfOption )
 {
@@ -574,7 +577,7 @@ static void InitializeConfOptions()
 	ADD( ConfOption( "MenuTimer",				MovePref,			"OFF","ON" ) );
 	ADD( ConfOption( "CoinMode",				CoinModeM,			"HOME","PAY","FREE PLAY" ) );
 	ADD( ConfOption( "CoinModeNoHome",			CoinModeNoHome,		"PAY","FREE PLAY" ) );
-	ADD( ConfOption( "Songs Per\nPlay",			SongsPerPlay,		"1","2","3","4","5","6","7" ) );
+	ADD( ConfOption( "SongsPerPlay",			SongsPerPlay,		"1","2","3","4","5","6","7" ) );
 	ADD( ConfOption( "SongsPerPlayOrEvent",			SongsPerPlayOrEventMode, "1","2","3","4","5","6","7","EVENT" ) );
 	ADD( ConfOption( "EventMode",				MovePref,			"OFF","ON" ) );
 	ADD( ConfOption( "Scoring\nType",			ScoringType,		"MAX2","5TH" ) );