diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
index 33deff58dc..5e1105c834 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
@@ -41,32 +41,30 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestPageSelectorValues()
+        public void TestCurrentPageReset()
         {
-            AddStep("10 max pages", () => setMaxPages(10));
-            AddStep("11 max pages", () => setMaxPages(11));
-            AddStep("200 max pages, current 199", () =>
-            {
-                setMaxPages(200);
-                setCurrentPage(199);
-            });
-            AddStep("200 max pages, current 201", () =>
-            {
-                setMaxPages(200);
-                setCurrentPage(201);
-            });
-            AddAssert("Current equals max", () => pageSelector.CurrentPage.Value == pageSelector.MaxPages.Value);
-            AddStep("200 max pages, current -10", () =>
-            {
-                setMaxPages(200);
-                setCurrentPage(-10);
-            });
-            AddAssert("Current is 1", () => pageSelector.CurrentPage.Value == 1);
-            AddStep("-10 max pages", () =>
-            {
-                setMaxPages(-10);
-            });
-            AddAssert("Current is 1, max is 1", () => pageSelector.CurrentPage.Value == 1 && pageSelector.MaxPages.Value == 1);
+            AddStep("Set 10 pages", () => setMaxPages(10));
+            AddStep("Select 5 page", () => setCurrentPage(5));
+            AddStep("Set 11 pages", () => setMaxPages(11));
+            AddAssert("Check 1 page is current", () => pageSelector.CurrentPage.Value == 1);
+        }
+
+        [Test]
+        public void TestUnexistingPageSelection()
+        {
+            AddStep("Set 10 pages", () => setMaxPages(10));
+            AddStep("Select 11 page", () => setCurrentPage(11));
+            AddAssert("Check current equals max", () => pageSelector.CurrentPage.Value == pageSelector.MaxPages.Value);
+
+            AddStep("Select -1 page", () => setCurrentPage(-1));
+            AddAssert("Check current is 1", () => pageSelector.CurrentPage.Value == 1);
+        }
+
+        [Test]
+        public void TestNegativeMaxPages()
+        {
+            AddStep("Set -10 pages", () => setMaxPages(-10));
+            AddAssert("Check current and max is 1", () => pageSelector.CurrentPage.Value == 1 && pageSelector.MaxPages.Value == 1);
         }
 
         [Test]
diff --git a/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
index eaa102bdd2..c2482d6330 100644
--- a/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
+++ b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
@@ -86,19 +86,10 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
             for (int i = 1; i <= MaxPages.Value; i++)
                 addDrawablePage(i);
 
-            if (CurrentPage.Value > MaxPages.Value)
-            {
-                CurrentPage.Value = MaxPages.Value;
-                return;
-            }
-
-            if (CurrentPage.Value < 1)
-            {
+            if (CurrentPage.Value == 1)
+                CurrentPage.TriggerChange();
+            else
                 CurrentPage.Value = 1;
-                return;
-            }
-
-            CurrentPage.TriggerChange();
         }
 
         private void updateButtonsState()
diff --git a/osu.Game/Graphics/UserInterface/PageSelector/PageSelectorButton.cs b/osu.Game/Graphics/UserInterface/PageSelector/PageSelectorButton.cs
index df007b32e0..e81ce20d27 100644
--- a/osu.Game/Graphics/UserInterface/PageSelector/PageSelectorButton.cs
+++ b/osu.Game/Graphics/UserInterface/PageSelector/PageSelectorButton.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
         {
             AutoSizeAxes = Axes.Both,
             Direction = FillDirection.Horizontal,
+            Spacing = new Vector2(3, 0),
             Children = new Drawable[]
             {
                 name = new OsuSpriteText