diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index a502c72fd1..69db6cb482 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -142,12 +142,7 @@ void ScreenSelect::Input( const InputEventPlus &input )
 	if( input.MenuI == MENU_BUTTON_COIN && input.type == IET_FIRST_PRESS )
 		this->UpdateSelectableChoices();
 
-	// HACK: Don't process JoinInput on the TitleMenu.  Otherwise, if the user presses start
-	// on a choice that doesn't move to a new screen, the player will be joined and the
-	// user will still be on the title menu.
-	bool bAllowJoinInput = !ALLOW_DISABLED_PLAYER_INPUT;
-
-	if( bAllowJoinInput && input.MenuI == MENU_BUTTON_START && Screen::JoinInput(input.pn) )
+	if( input.MenuI == MENU_BUTTON_START && Screen::JoinInput(input.pn) )
 	{
 		if( input.type == IET_FIRST_PRESS )
 			this->UpdateSelectableChoices();
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index f18ba7400e..bc5cc845e8 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -714,10 +714,6 @@ void ScreenSelectMaster::MenuStart( const InputEventPlus &input )
 		return;
 	PlayerNumber pn = input.pn;
 	
-	// If the player isn't already joined, try to join them.
-	// Allow a player to join even if input is locked or someone has already already chosen.
-	Screen::JoinInput( pn );
-
 	if( m_fLockInputSecs > 0 )
 		return;
 	if( m_bChosen[pn] )