diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
index 924396ce03..8ef84fb094 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Tests.Visual.Editing
             beatmap.ControlPointInfo.Clear();
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
             beatmap.ControlPointInfo.Add(2000, new TimingControlPoint { BeatLength = 500 });
+            beatmap.ControlPointInfo.Add(20000, new TimingControlPoint { BeatLength = 500 });
 
             return beatmap;
         }
@@ -116,6 +117,26 @@ namespace osu.Game.Tests.Visual.Editing
             pressAndCheckTime(Key.Right, 3000);
         }
 
+        [Test]
+        public void TestSeekBetweenControlPoints()
+        {
+            AddStep("seek to 0", () => EditorClock.Seek(0));
+            AddAssert("time is 0", () => EditorClock.CurrentTime == 0);
+
+            // already at first control point, noop
+            pressAndCheckTime(Key.Up, 0);
+
+            pressAndCheckTime(Key.Down, 2000);
+
+            pressAndCheckTime(Key.Down, 20000);
+            // at last control point, noop
+            pressAndCheckTime(Key.Down, 20000);
+
+            pressAndCheckTime(Key.Up, 2000);
+            pressAndCheckTime(Key.Up, 0);
+            pressAndCheckTime(Key.Up, 0);
+        }
+
         private void pressAndCheckTime(Key key, double expectedTime)
         {
             AddStep($"press {key}", () => InputManager.Key(key));
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 4c44117581..e40910e5c6 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -499,6 +499,15 @@ namespace osu.Game.Screens.Edit
                     seek(e, 1);
                     return true;
 
+                // Of those, these two keys are reversed from stable because it feels more natural (and matches mouse wheel scroll directionality).
+                case Key.Up:
+                    seekControlPoint(-1);
+                    return true;
+
+                case Key.Down:
+                    seekControlPoint(1);
+                    return true;
+
                 // Track traversal keys.
                 // Matching osu-stable implementations.
                 case Key.Z:
@@ -892,6 +901,16 @@ namespace osu.Game.Screens.Edit
             }
         }
 
+        private void seekControlPoint(int direction)
+        {
+            var found = direction < 1
+                ? editorBeatmap.ControlPointInfo.AllControlPoints.LastOrDefault(p => p.Time < clock.CurrentTime)
+                : editorBeatmap.ControlPointInfo.AllControlPoints.FirstOrDefault(p => p.Time > clock.CurrentTime);
+
+            if (found != null)
+                clock.Seek(found.Time);
+        }
+
         private void seek(UIEvent e, int direction)
         {
             double amount = e.ShiftPressed ? 4 : 1;