diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 9030d77218..6b93c96005 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1382,7 +1382,8 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
 	else if( type==IET_FIRST_PRESS && 
 		!PREFSMAN->m_bAutoPlay && 
 		MenuI.IsValid() &&
-		GAMESTATE->IsPlayerEnabled( MenuI.player ) )
+		GAMESTATE->IsPlayerEnabled( MenuI.player ) &&
+		GAMESTATE->IsBattleMode() )
 	{
 		int iItemSlot;
 		switch( MenuI.button )