diff --git a/stepmania/src/ModeChoice.cpp b/stepmania/src/ModeChoice.cpp
index b6b4023a58..ed36fe75b3 100644
--- a/stepmania/src/ModeChoice.cpp
+++ b/stepmania/src/ModeChoice.cpp
@@ -473,15 +473,6 @@ void ModeChoice::Apply( PlayerNumber pn ) const
 	// we don't override the user's changes if they back out.
 	if( GAMESTATE->m_PlayMode == PLAY_MODE_ONI && GAMESTATE->m_PlayMode != OldPlayMode )
 		GAMESTATE->m_SongOptions.m_LifeType = SongOptions::LIFE_BATTERY;
-
-
-	//
-	// We know what players are joined at the time we set the Style
-	//
-	if( m_pStyle != NULL )
-	{
-		GAMESTATE->PlayersFinalized();
-	}
 }
 
 bool ModeChoice::IsZero() const
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 197a1d6ffd..1a5f667870 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -173,14 +173,12 @@ void ScreenSelect::FinalizeChoices()
 	 * invalidate the choice we've already made.  Hack: apply the style.
 	 * (Applying the style may have other side-effects, so it'll be re-applied
 	 * in SM_GoToNextScreen.) */
-	FOREACH_PlayerNumber( p )
-		if( GAMESTATE->IsHumanPlayer(p) )
-		{
-			const int sel = GetSelectionIndex( p );
-			
-			if( m_aModeChoices[sel].m_pStyle )
-				GAMESTATE->m_pCurStyle = m_aModeChoices[sel].m_pStyle;
-		}
+	FOREACH_HumanPlayer( p )
+	{
+		const int sel = GetSelectionIndex( p );
+		if( m_aModeChoices[sel].m_pStyle )
+			GAMESTATE->m_pCurStyle = m_aModeChoices[sel].m_pStyle;
+	}
 	SCREENMAN->RefreshCreditsMessages();
 }
 
@@ -204,9 +202,21 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 			/* Apply here, not in SM_AllDoneChoosing, because applying can take a very
 			 * long time (200+ms), and at SM_AllDoneChoosing, we're still tweening stuff
 			 * off-screen. */
-			FOREACH_PlayerNumber( p )
-				if( GAMESTATE->IsHumanPlayer(p) )
-					m_aModeChoices[this->GetSelectionIndex((PlayerNumber)p)].Apply( (PlayerNumber)p );
+			FOREACH_HumanPlayer( p )
+				m_aModeChoices[this->GetSelectionIndex(p)].Apply( p );
+
+			//
+			// Finalize players if we set a style on this screen.
+			//
+			FOREACH_HumanPlayer( p )
+			{
+				const int sel = GetSelectionIndex( p );
+				if( m_aModeChoices[sel].m_pStyle )
+				{
+					GAMESTATE->PlayersFinalized();
+					break;
+				}
+			}
 
 			const int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber);
 			if( m_aModeChoices[iSelectionIndex].m_sScreen != "" )