diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9dbb5f4cfe..81ae08aea1 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -111,13 +111,11 @@ namespace osu.Game.Screens.Edit
                 if (!workingBeatmapUpdated)
                     return false;
 
-                var loadedScreen = screenContainer?.Children.SingleOrDefault(s => s.IsLoaded);
-
-                if (loadedScreen == null)
+                if (currentScreen?.IsLoaded != true)
                     return false;
 
-                if (loadedScreen is EditorScreenWithTimeline)
-                    return loadedScreen.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true;
+                if (currentScreen is EditorScreenWithTimeline)
+                    return currentScreen.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true;
 
                 return true;
             }