diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 13ae2021dc..b5642cc34f 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -143,14 +143,16 @@ void ScreenSelect::Input( const InputEventPlus &input )
 	m_timerIdleComment.GetDeltaTime();
 	m_timerIdleTimeout.GetDeltaTime();
 
+	/* Choices may change when more coins are inserted. */
+	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( input.MenuI == MENU_BUTTON_COIN ||
-		(bAllowJoinInput && input.MenuI == MENU_BUTTON_START && Screen::JoinInput(input.pn)) )
+	if( bAllowJoinInput && input.MenuI == MENU_BUTTON_START && Screen::JoinInput(input.pn) )
 	{
 		if( input.type == IET_FIRST_PRESS )
 			this->UpdateSelectableChoices();