diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 022e02746d..f94c32d273 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -215,8 +215,9 @@ bool GameState::IsPlayable( const ModeChoice& mc )
 
 bool GameState::IsPlayerEnabled( PlayerNumber pn )
 {
-	if( GAMESTATE->m_bIsOnSystemMenu )	// if no style set (we're in TitleMenu, ConfigInstruments or something)
-		return true;				// allow input from both sides
+	// no longer necessary
+//	if( GAMESTATE->m_bIsOnSystemMenu )	// if no style set (we're in TitleMenu, ConfigInstruments or something)
+//		return true;				// allow input from both sides
 
 	if( m_CurStyle == STYLE_INVALID )	// no style chosen
 		if( this->m_bPlayersCanJoin )	
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index ae843c7f01..0f94b21d16 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -434,12 +434,16 @@ void ScreenManager::SetNewScreen( CString sClassName )
 
 	/* If this is a system menu, don't let the operator key touch it! 
 		However, if you add an options screen, please include it here -- Miryokuteki */
-	if(	sClassName == "ScreenOptionsMenu" || sClassName == "ScreenMachineOptions" || 
-		 sClassName == "ScreenOptions" || sClassName == "ScreenInputOptions" || 
-		 sClassName == "ScreenGraphicOptions" || sClassName == "ScreenGameplayOptions" || 
-		 sClassName == "ScreenMapControllers" || sClassName == "ScreenPlayerOptions" || 
-		 sClassName == "ScreenAppearanceOptions" || sClassName == "ScreenEdit" || 
-		 sClassName == "ScreenEditMenu" || sClassName == "ScreenSoundOptions") 
+	if(	sClassName == "ScreenOptionsMenu" ||
+		sClassName == "ScreenMachineOptions" || 
+		sClassName == "ScreenInputOptions" || 
+		sClassName == "ScreenGraphicOptions" || 
+		sClassName == "ScreenGameplayOptions" || 
+		sClassName == "ScreenMapControllers" || 
+		sClassName == "ScreenAppearanceOptions" || 
+		sClassName == "ScreenEdit" || 
+		sClassName == "ScreenEditMenu" || 
+		sClassName == "ScreenSoundOptions" ) 
 		GAMESTATE->m_bIsOnSystemMenu = true;
 	else 
 		GAMESTATE->m_bIsOnSystemMenu = false;