diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index d2e2b127ef..afdff2311e 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania 5.0 Preview 2 | 201107??
 --------------------------------------------------------------------------------
 
+2011/07/02
+----------
+* [ScreenEdit] Fixed a crash when hitting Enter in the F1 help menu. [AJ]
+
 2011/06/30
 ----------
 * [NotesAll] Use #FIRSTSECOND, #LASTSECOND, and #LASTSECONDHINT instead of the
diff --git a/src/ScreenOptions.cpp b/src/ScreenOptions.cpp
index e783125e00..1afe97c5ee 100644
--- a/src/ScreenOptions.cpp
+++ b/src/ScreenOptions.cpp
@@ -808,7 +808,17 @@ void ScreenOptions::MenuStart( const InputEventPlus &input )
 void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
 {
 	PlayerNumber pn = input.pn;
+
 	int iCurRow = m_iCurrentRow[pn];
+
+	if( iCurRow < 0 )
+	{
+		// this shouldn't be happening, but it is, so we need to bail out. -aj
+		SCREENMAN->PlayStartSound();
+		this->BeginFadingOut();
+		return;
+	}
+
 	OptionRow &row = *m_pRows[iCurRow];
 
 	if( m_OptionsNavigation == NAV_THREE_KEY_MENU && row.GetRowType() != OptionRow::RowType_Exit )