diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 989f232692..9d210ee5ee 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1475,7 +1475,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
 
 		if( MenuI.button == MENU_BUTTON_BACK && 
 			((!PREFSMAN->m_bDelayedEscape && type==IET_FIRST_PRESS) ||
-			DeviceI.device==DEVICE_KEYBOARD  ||
+			(DeviceI.device==DEVICE_KEYBOARD && (type==IET_SLOW_REPEAT||type==IET_FAST_REPEAT)) ||
 			(DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT)) )
 		{
 			/* I had battle mode back out on me mysteriously once. -glenn */