diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 0af5419afa..c47605b7e2 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -908,11 +908,14 @@ void ScreenGameplay::SetupSong( int iSongIndex )
 			a.sModifiers = po.m_sNoteSkin;
 
 			pi->GetPlayerState()->LaunchAttack( a );
-
-			/* Update attack bOn flags. */
-			pi->GetPlayerState()->Update( 0 );
 		}
-		
+
+		/* Update attack bOn flags, and rebuild Current-level options
+		 * from Song-level options.  The current NoteSkin could have changed
+		 * because of an attack ending. 
+		 */
+		pi->GetPlayerState()->Update( 0 );
+
 		// load player
 		{
 			pi->m_NoteData = ndTransformed;