diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 92f4f1d6aa..43778456be 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -2789,7 +2789,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 	else if ( SM == SM_BackFromSpeedModeChange )
 	{
 		int tmp = StringToInt(ScreenTextEntry::s_sLastAnswer );
-		if( tmp == 0 )
+		if( tmp == 0 || ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "b" || ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "B" )
 		{
 			GetAppropriateTiming().SetSpeedModeAtBeat( GetBeat(), 0 );
 		}