diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp
index 01812334f9..6c77770082 100644
--- a/stepmania/src/CourseContentsList.cpp
+++ b/stepmania/src/CourseContentsList.cpp
@@ -72,6 +72,7 @@ void CourseContentsList::SetFromGameState()
 
 	bool bLoop = pMasterTrail->m_vEntries.size() > uNumEntriesToShow;
 
+	this->SetLoop( bLoop );
 	this->Load2( 
 		(float)MAX_VISIBLE_ITEMS,
 		bLoop );
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 4f3ada642b..e674bded60 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -152,6 +152,7 @@ void ScreenSelectMaster::Init()
 	{
 		FOREACH( PlayerNumber, vpns, p )
 		{
+			m_Scroller[*p].SetLoop( LOOP_SCROLLER );
 			m_Scroller[*p].Load2(
 				SCROLLER_NUM_ITEMS_TO_DRAW,
 				LOOP_SCROLLER );