diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 4bc7f5831e..52a1092a5e 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -4289,7 +4289,9 @@ void ScreenEdit::SetupCourseAttacks()
 		{
 			FOREACH(Attack, attacks, attack)
 			{
-				GAMESTATE->m_pPlayerState[PLAYER_1]->LaunchAttack( *attack );
+				float fBeat = GetAppropriateTiming().GetBeatFromElapsedTime(attack->fStartSecond);
+				if (fBeat >= GetBeat())
+					GAMESTATE->m_pPlayerState[PLAYER_1]->LaunchAttack( *attack );
 			}
 		}
 	}