diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index bc7754fc8d..8326be3db0 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -211,7 +211,20 @@ void LightsManager::Update( float fDeltaTime )
 	case LIGHTSMODE_ALL_CLEARED:
 		{
 			FOREACH_CabinetLight( cl )
-				m_LightsState.m_bCabinetLights[cl] = true;
+			{
+				bool b = true;
+				switch( cl )
+				{
+				case LIGHT_BUTTONS_LEFT:
+				case LIGHT_BUTTONS_RIGHT:
+					b = false;
+					break;
+				default:
+					b = true;
+					break;
+				}
+				m_LightsState.m_bCabinetLights[cl] = b;
+			}
 		}
 		break;
 	case LIGHTSMODE_TEST_AUTO_CYCLE: