diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index abd8272633..73af2591c8 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -132,6 +132,9 @@ namespace osu.Game.Skinning.Editor
         {
             Debug.Assert(skinEditor != null);
 
+            if (!target.IsCurrentScreen())
+                return;
+
             if (!target.IsLoaded)
             {
                 Scheduler.AddOnce(setTarget, target);