diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 9c5a6e458b..bbd996ff8b 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -6,9 +6,15 @@ ________________________________________________________________________________
 
 ================================================================================
 
-StepMania 5.0 alpha 2 | 20120???
+StepMania 5.0 alpha 2 | 201203??
 --------------------------------------------------------------------------------
 
+2012/03/07
+----------
+* [ScreenSelectMaster] Now updates choices on player join; it will move the
+  scroller to the correct location, but the GainFocus/LoseFocus commands don't
+  seem to work. [AJ]
+
 2012/03/05
 ----------
 * [GameCommand] Added GetDifficulty(), GetCourseDifficulty(), GetPlayMode(),
diff --git a/src/ScreenSelectMaster.cpp b/src/ScreenSelectMaster.cpp
index 3c3a80a4b9..951febdadc 100644
--- a/src/ScreenSelectMaster.cpp
+++ b/src/ScreenSelectMaster.cpp
@@ -334,6 +334,16 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
 	}
 }
 
+void ScreenSelectMaster::HandleMessage( const Message &msg )
+{
+	if ( msg == Message_PlayerJoined )
+	{
+		UpdateSelectableChoices();
+	}
+
+	ScreenSelect::HandleMessage( msg );
+}
+
 int ScreenSelectMaster::GetSelectionIndex( PlayerNumber pn )
 {
 	return m_iChoice[pn];
diff --git a/src/ScreenSelectMaster.h b/src/ScreenSelectMaster.h
index 5a6cc8e08f..39e3d4f147 100644
--- a/src/ScreenSelectMaster.h
+++ b/src/ScreenSelectMaster.h
@@ -39,6 +39,7 @@ public:
 	virtual void TweenOffScreen();
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );
+	virtual void HandleMessage( const Message &msg );
 	virtual bool AllowLateJoin() const { return true; }
 
 	// sm-ssc additions: