diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index 588cddea7d..e65dcb19b1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -10,6 +10,7 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -45,7 +46,7 @@ namespace osu.Game.Tests.Visual.Ranking
             AddStep("add panel", () => list.AddScore(score));
 
             assertScoreState(score, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
@@ -58,16 +59,30 @@ namespace osu.Game.Tests.Visual.Ranking
             AddStep("add panel", () => list.AddScore(score));
 
             assertScoreState(score, false);
-            assertPanelCentred();
+            assertFirstPanelCentred();
 
             AddStep("select score", () => list.SelectedScore.Value = score);
 
             assertScoreState(score, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
-        public void TestAddManyScoresAfter()
+        public void TestAddManyNonExpandedPanels()
+        {
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add many scores", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            });
+
+            assertFirstPanelCentred();
+        }
+
+        [Test]
+        public void TestAddManyScoresAfterExpandedPanel()
         {
             var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
 
@@ -86,11 +101,11 @@ namespace osu.Game.Tests.Visual.Ranking
             });
 
             assertScoreState(initialScore, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
-        public void TestAddManyScoresBefore()
+        public void TestAddManyScoresBeforeExpandedPanel()
         {
             var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
 
@@ -109,11 +124,11 @@ namespace osu.Game.Tests.Visual.Ranking
             });
 
             assertScoreState(initialScore, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
-        public void TestAddManyPanelsOnBothSides()
+        public void TestAddManyPanelsOnBothSidesOfExpandedPanel()
         {
             var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
 
@@ -135,7 +150,36 @@ namespace osu.Game.Tests.Visual.Ranking
             });
 
             assertScoreState(initialScore, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
+        }
+
+        [Test]
+        public void TestSelectMultipleScores()
+        {
+            var firstScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+            var secondScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add scores and select first", () =>
+            {
+                list.AddScore(firstScore);
+                list.AddScore(secondScore);
+                list.SelectedScore.Value = firstScore;
+            });
+
+            assertScoreState(firstScore, true);
+            assertScoreState(secondScore, false);
+
+            AddStep("select second score", () =>
+            {
+                InputManager.MoveMouseTo(list.ChildrenOfType<ScorePanel>().Single(p => p.Score == secondScore));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertScoreState(firstScore, false);
+            assertScoreState(secondScore, true);
+            assertExpandedPanelCentred();
         }
 
         private void createListStep(Func<ScorePanelList> creationFunc)
@@ -149,13 +193,16 @@ namespace osu.Game.Tests.Visual.Ranking
             AddUntilStep("wait for load", () => list.IsLoaded);
         }
 
-        private void assertPanelCentred() => AddUntilStep("expanded panel centred", () =>
+        private void assertExpandedPanelCentred() => AddUntilStep("expanded panel centred", () =>
         {
             var expandedPanel = list.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
             return Precision.AlmostEquals(expandedPanel.ScreenSpaceDrawQuad.Centre.X, list.ScreenSpaceDrawQuad.Centre.X, 1);
         });
 
+        private void assertFirstPanelCentred()
+            => AddUntilStep("first panel centred", () => Precision.AlmostEquals(list.ChildrenOfType<ScorePanel>().First().ScreenSpaceDrawQuad.Centre.X, list.ScreenSpaceDrawQuad.Centre.X, 1));
+
         private void assertScoreState(ScoreInfo score, bool expanded)
-            => AddUntilStep($"correct score expanded = {expanded}", () => (list.ChildrenOfType<ScorePanel>().Single(p => p.Score == score).State == PanelState.Expanded) == expanded);
+            => AddUntilStep($"score expanded = {expanded}", () => (list.ChildrenOfType<ScorePanel>().Single(p => p.Score == score).State == PanelState.Expanded) == expanded);
     }
 }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 89f5a47ee8..18db3f2af4 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Ranking
         private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
         {
             // Contract the old panel.
-            foreach (var p in flow.Where(p => p.Score != score.OldValue))
+            foreach (var p in flow.Where(p => p.Score == score.OldValue))
             {
                 p.State = PanelState.Contracted;
                 p.Margin = new MarginPadding();
@@ -126,8 +126,19 @@ namespace osu.Game.Screens.Ranking
         {
             base.Update();
 
+            float offset = DrawWidth / 2f;
+
             // Add padding to both sides such that the centre of an expanded panel on either side is in the middle of the screen.
-            flow.Padding = new MarginPadding { Horizontal = DrawWidth / 2f - ScorePanel.EXPANDED_WIDTH / 2f - expanded_panel_spacing };
+
+            if (SelectedScore.Value != null)
+            {
+                // The expanded panel has extra padding applied to it, so it needs to be included into the offset.
+                offset -= ScorePanel.EXPANDED_WIDTH / 2f + expanded_panel_spacing;
+            }
+            else
+                offset -= ScorePanel.CONTRACTED_WIDTH / 2f;
+
+            flow.Padding = new MarginPadding { Horizontal = offset };
         }
 
         private class Flow : FillFlowContainer<ScorePanel>