diff --git a/src/ScreenSelectMaster.cpp b/src/ScreenSelectMaster.cpp
index 43988cbfe6..f9ed16e3a4 100644
--- a/src/ScreenSelectMaster.cpp
+++ b/src/ScreenSelectMaster.cpp
@@ -392,7 +392,7 @@ try_again:
 		return false; // went full circle and none found
 	seen.insert( iSwitchToIndex );
 
-	if( !m_aGameCommands[iSwitchToIndex].IsPlayable() )
+	if( !m_aGameCommands[iSwitchToIndex].IsPlayable() && !DO_SWITCH_ANYWAYS )
 		goto try_again;
 
 	return ChangeSelection( pn, dir, iSwitchToIndex );