diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index 396852365f..a892ec1ca3 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -82,7 +82,7 @@ private void editorVisibilityChanged(ValueChangedEvent<Visibility> visibility)
         {
             if (visibility.NewValue == Visibility.Visible)
             {
-                target.Masking = true;
+                updateMasking();
                 target.AllowScaling = false;
                 target.RelativePositionAxes = Axes.Both;
 
@@ -93,11 +93,14 @@ private void editorVisibilityChanged(ValueChangedEvent<Visibility> visibility)
             {
                 target.AllowScaling = true;
 
-                target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => target.Masking = false);
+                target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => updateMasking());
                 target.MoveToX(0f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
             }
         }
 
+        private void updateMasking() =>
+            target.Masking = skinEditor.State.Value == Visibility.Visible;
+
         public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
         {
         }