diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 897c6ec531..ff650a7ad7 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Screens.Edit.Components
 
         private void togglePause()
         {
+            if ((adjustableClock as EditorClock)?.PlaybackFinished == true)
+                adjustableClock.Seek(0);
+
             if (adjustableClock.IsRunning)
                 adjustableClock.Stop();
             else
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e5e47507f3..0e5b42fe69 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
+        public bool PlaybackFinished { get; private set; }
+
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
@@ -37,6 +39,23 @@ namespace osu.Game.Screens.Edit
             TrackLength = trackLength;
         }
 
+        public override void ProcessFrame()
+        {
+            base.ProcessFrame();
+
+            if (CurrentTime >= TrackLength)
+            {
+                if (!PlaybackFinished)
+                {
+                    PlaybackFinished = true;
+                    Stop();
+                    Seek(TrackLength);
+                }
+            }
+            else
+                PlaybackFinished = false;
+        }
+
         /// <summary>
         /// Seek to the closest snappable beat from a time.
         /// </summary>