diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 61bf5eeffe..41608c997e 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -1310,10 +1310,17 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
 
 	if( optrow.bOneChoiceForAllPlayers )
 	{
+		row.m_iChoiceWithFocus[pn] = iNewChoiceWithFocus;
+
+		if( m_InputMode == INPUTMODE_TOGETHER )
+		{
+			// lock focus together
+			FOREACH_HumanPlayer( pn )
+				row.m_iChoiceWithFocus[pn] = iNewChoiceWithFocus;
+		}
+
 		for( int p=0; p<NUM_PLAYERS; p++ )
 		{
-			row.m_iChoiceWithFocus[p] = iNewChoiceWithFocus;
-
 			if( m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN )
 			{
 				;	// do nothing
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 8c3cbf2c67..cdb443a329 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -146,7 +146,8 @@ protected:
 		}
 		void SetOneSharedSelection( int iChoice )
 		{
-			SetOneSelection( (PlayerNumber)0, iChoice );
+			FOREACH_HumanPlayer( pn )
+				SetOneSelection( pn, iChoice );
 		}
 	};
 	vector<Row*>		m_Rows;