diff --git a/stepmania/src/OptionsList.cpp b/stepmania/src/OptionsList.cpp
index 8d71c423d9..dc76f35986 100644
--- a/stepmania/src/OptionsList.cpp
+++ b/stepmania/src/OptionsList.cpp
@@ -241,7 +241,10 @@ void OptionsList::Load( RString sType, PlayerNumber pn )
 
 	this->PlayCommand( "TweenOff" );
 	this->FinishTweening();
+}
 
+void OptionsList::Reset()
+{
 	/* Import options. */
 	FOREACHM( RString, OptionRowHandler *, m_Rows, hand )
 	{
diff --git a/stepmania/src/OptionsList.h b/stepmania/src/OptionsList.h
index 81ef741159..d7e2591828 100644
--- a/stepmania/src/OptionsList.h
+++ b/stepmania/src/OptionsList.h
@@ -45,6 +45,7 @@ public:
 	~OptionsList();
 
 	void Load( RString sType, PlayerNumber pn );
+	void Reset();
 
 	void Link( OptionsList *pLink ) { m_pLinked = pLink; }
 
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 607048254b..69befbbfb4 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -200,6 +200,10 @@ void ScreenSelectMusic::BeginScreen()
 	m_bAllowOptionsMenu = m_bAllowOptionsMenuRepeat = false;
 	ZERO( m_iSelection );
 
+	if( USE_OPTIONS_LIST )
+		FOREACH_HumanPlayer( pn )
+			m_OptionsList[pn].Reset();
+
 	AfterMusicChange();
 
 	SOUND->PlayOnceFromAnnouncer( "select music intro" );