diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index c483ca0a7c..8b7671fba1 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -2669,9 +2669,12 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 	else if ( SM == SM_BackFromLabelChange )
 	{
 		RString sLabel = ScreenTextEntry::s_sLastAnswer;
-		sLabel.Replace("=", "_");
-		sLabel.Replace(",", "_");
-		m_pSong->m_Timing.SetLabelAtBeat( GAMESTATE->m_fSongBeat, sLabel );
+		if ( sLabel.length() > 0 )
+		{
+			sLabel.Replace("=", "_");
+			sLabel.Replace(",", "_");
+			m_pSong->m_Timing.SetLabelAtBeat( GAMESTATE->m_fSongBeat, sLabel );
+		}
 		SetDirty( true );
 	}
 	else if ( SM == SM_BackFromWarpChange )