diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
index e5efa65c91..cb83fbd028 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
@@ -22,6 +22,28 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
+
+            AddStep("1 max pages", () => redraw(1));
+            AddStep("10 max pages", () => redraw(10));
+            AddStep("200 max pages, current 199", () => redraw(200, 199));
+            AddStep("200 max pages, current 201", () => redraw(200, 201));
+            AddStep("200 max pages, current -10", () => redraw(200, -10));
+        }
+
+        private void redraw(int maxPages, int currentPage = 0)
+        {
+            Clear();
+
+            var selector = new PageSelector(maxPages)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+
+            if (currentPage != 0)
+                selector.CurrentPage.Value = currentPage;
+
+            Add(selector);
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/PageSelector.cs b/osu.Game/Graphics/UserInterface/PageSelector.cs
index 9a5ffad0d4..79a1680e4b 100644
--- a/osu.Game/Graphics/UserInterface/PageSelector.cs
+++ b/osu.Game/Graphics/UserInterface/PageSelector.cs
@@ -59,11 +59,25 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.LoadComplete();
 
-            CurrentPage.BindValueChanged(page => redraw(page.NewValue), true);
+            CurrentPage.BindValueChanged(_ => redraw(), true);
         }
 
-        private void redraw(int newPage)
+        private void redraw()
         {
+            if (CurrentPage.Value > maxPages)
+            {
+                CurrentPage.Value = maxPages;
+                return;
+            }
+
+            if (CurrentPage.Value < 1)
+            {
+                CurrentPage.Value = 1;
+                return;
+            }
+
+            int newPage = CurrentPage.Value;
+
             previousPageButton.Enabled.Value = newPage != 1;
             nextPageButton.Enabled.Value = newPage != maxPages;