diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index a10066edfd..a9d42a6c3b 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,11 @@ ________________________________________________________________________________
 StepMania 5.0 ????????? | 20110???
 --------------------------------------------------------------------------------
 
+2011/07/03
+----------
+* [ScreenEdit] Fix a crash if one tries to remove an attack that doesn't
+  exist at that time. [Wolfman2000]
+
 ================================================================================
 StepMania 5.0 Preview 2 | 20110703
 --------------------------------------------------------------------------------
diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index ed8bebe2d4..a1af3713a6 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -3126,8 +3126,8 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 		
 		if (ScreenMiniMenu::s_iLastRowCode == ScreenEdit::remove )
 		{
-			ASSERT(iAttack >= 0);
-			attacks.erase(attacks.begin() + iAttack);
+			if (iAttack > 0)
+				attacks.erase(attacks.begin() + iAttack);
 		}
 		else
 		{