diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 483a73bd1b..a6fd0659a8 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -405,6 +405,7 @@ void ScreenRanking::Scroll( int iDir )
 	{
 		// TODO: play sound
 		m_ListScoreRowItems.SetDestinationItem( fDest );
+		m_ListCourseRowItems.SetDestinationItem( fDest );
 	}
 }
 
@@ -696,6 +697,12 @@ float ScreenRanking::SetPage( PageToShow pts )
 				vpActors.push_back( m_vpCourseScoreRowItem[i] );
 			m_ListCourseRowItems.Load( vpActors, SONG_SCORE_ROWS_TO_SHOW, SCREEN_WIDTH, ROW_SPACING_Y, false, SONG_SCORE_SECONDS_PER_ROW, 0, false );
 
+			if( (bool)MANUAL_SCROLLING )
+			{
+				m_ListCourseRowItems.SetCurrentItem( 0 );
+				m_ListCourseRowItems.SetDestinationItem( 0 );
+			}
+
 			for( unsigned s=0; s<m_vpCourseScoreRowItem.size(); s++ )
 			{
 				CourseScoreRowItem *pCourseScoreRowItem = m_vpCourseScoreRowItem[s];