diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index a0bf88581c..b23a5c7847 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -438,6 +438,24 @@ void ScreenOptionsMaster::ImportOptions()
 	}
 }
 
+/* Import only settings specific to the given player. */
+void ScreenOptionsMaster::ImportOptionsForPlayer( PlayerNumber pn )
+{
+	if( !GAMESTATE->IsHumanPlayer(pn) )
+		return;
+
+	for( unsigned i = 0; i < OptionRowHandlers.size(); ++i )
+	{
+		const OptionRowHandler &hand = OptionRowHandlers[i];
+		const OptionRowData &data = m_OptionRowAlloc[i];
+		Row &row = *m_Rows[i];
+
+		if( data.bOneChoiceForAllPlayers )
+			continue;
+		ImportOption( data, hand, pn, i, row.m_vbSelected[pn] );
+	}
+}
+
 int GetOneSelection( const vector<bool> &vbSelected )
 {
 	for( unsigned i=0; i<vbSelected.size(); i++ )
diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h
index 11c8222976..1192e49596 100644
--- a/stepmania/src/ScreenOptionsMaster.h
+++ b/stepmania/src/ScreenOptionsMaster.h
@@ -54,6 +54,7 @@ private:
 protected:
 	virtual void ImportOptions();
 	virtual void ExportOptions();
+	virtual void ImportOptionsForPlayer( PlayerNumber pn ); // used by ScreenPlayerOptions
 
 	virtual void GoToNextState();
 	virtual void GoToPrevState();
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index febbe63fd6..5447afe4a9 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -130,7 +130,7 @@ void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventTyp
 		
 		UtilCommand( m_sprCancelAll[pn], m_sName, "Show" );
 
-		this->ImportOptions();
+		this->ImportOptionsForPlayer( pn );
 		this->PositionUnderlines();
 	}