diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index ff650a7ad7..897c6ec531 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -87,9 +87,6 @@ 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 0e5b42fe69..aef304bd6e 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
-        public bool PlaybackFinished { get; private set; }
+        private bool playbackFinished;
 
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
         {
@@ -43,17 +43,19 @@ namespace osu.Game.Screens.Edit
         {
             base.ProcessFrame();
 
-            if (CurrentTime >= TrackLength)
+            var playbackAlreadyStopped = playbackFinished;
+            playbackFinished = CurrentTime >= TrackLength;
+
+            if (playbackFinished && IsRunning)
             {
-                if (!PlaybackFinished)
+                if (!playbackAlreadyStopped)
                 {
-                    PlaybackFinished = true;
                     Stop();
                     Seek(TrackLength);
                 }
+                else
+                    Seek(0);
             }
-            else
-                PlaybackFinished = false;
         }
 
         /// <summary>