diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 139d553934..91a9a28fc5 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -579,10 +579,9 @@ void OptionRow::UpdateText()
 	}
 }
 
-void OptionRow::SetRowFocus( bool bRowHasFocus[NUM_PLAYERS] )
+void OptionRow::SetRowHasFocus( PlayerNumber pn, bool bRowHasFocus )
 {
-	FOREACH_PlayerNumber( p )
-		m_bRowHasFocus[p] = bRowHasFocus[p];
+	m_bRowHasFocus[pn] = bRowHasFocus;
 }
 
 void OptionRow::UpdateEnabledDisabled()
diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h
index a173b1133e..773214fdc8 100644
--- a/stepmania/src/OptionRow.h
+++ b/stepmania/src/OptionRow.h
@@ -151,7 +151,7 @@ public:
 	void PositionUnderlines( PlayerNumber pn );
 	void PositionIcons();
 	void UpdateText();
-	void SetRowFocus( bool bRowHasFocus[NUM_PLAYERS] );
+	void SetRowHasFocus( PlayerNumber pn, bool bRowHasFocus );
 	void UpdateEnabledDisabled();
 
 	int GetOneSelection( PlayerNumber pn, bool bAllowFail=false ) const;
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 3ee92d4907..544ca6cbf6 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -540,11 +540,9 @@ void ScreenOptions::UpdateEnabledDisabled( int r )
 {
 	OptionRow &row = *m_pRows[r];
 
-	bool bRowHasFocus[NUM_PLAYERS];
 	FOREACH_PlayerNumber( pn )
-		bRowHasFocus[pn] = GAMESTATE->IsHumanPlayer(pn) && m_iCurrentRow[pn] == (int)r;
+		row.SetRowHasFocus( pn, GAMESTATE->IsHumanPlayer(pn) && m_iCurrentRow[pn] == (int)r );
 
-	row.SetRowFocus( bRowHasFocus );
 	row.UpdateEnabledDisabled();
 }