diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index a533f28f31..116a085aee 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -480,17 +480,18 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, int iNewChoice )
 
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{
+		const int iOldChoice = m_iChoice[p];
+
+		if( !bMoveAll && p!=pn )
+			continue;	// skip
+
 		/* Set the new m_iChoice even for disabled players, since a player might
 		 * join on a SHARED_PREVIEW_AND_CURSOR after the cursor has been moved. */
-		const int iOldChoice = m_iChoice[p];
 		m_iChoice[p] = iNewChoice;
 
 		if( !GAMESTATE->IsHumanPlayer(p) )
 			continue;	// skip
 
-		if( !bMoveAll && p!=pn )
-			continue;	// skip
-
 		if( SHARED_PREVIEW_AND_CURSOR )
 		{
 			for( int i=0; i<NUM_PREVIEW_PARTS; i++ )