diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 248779a9f8..48b793d1b5 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -102,10 +102,7 @@ namespace osu.Game.Screens.Edit
             this.beatmapInfo = beatmapInfo ?? playableBeatmap.BeatmapInfo;
 
             if (beatmapSkin is LegacyBeatmapSkin skin)
-            {
-                BeatmapSkin = new EditorBeatmapSkin(playableBeatmap.BeatmapInfo!.BeatmapSet!, skin);
-                BeatmapSkin.BeatmapSkinChanged += SaveState;
-            }
+                BeatmapSkin = new EditorBeatmapSkin(this, skin);
 
             beatmapProcessor = new EditorBeatmapProcessor(this, playableBeatmap.BeatmapInfo.Ruleset.CreateInstance());
 
diff --git a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
index 0fbfb7b2d0..50090b7035 100644
--- a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osu.Game.Beatmaps;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -34,10 +33,13 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public BindableList<Colour4> ComboColours { get; }
 
-        public EditorBeatmapSkin(BeatmapSetInfo beatmapSet, LegacyBeatmapSkin skin)
-        {
-            Skin = skin;
+        private readonly EditorBeatmap editorBeatmap;
 
+        public EditorBeatmapSkin(EditorBeatmap editorBeatmap, LegacyBeatmapSkin skin)
+        {
+            this.editorBeatmap = editorBeatmap;
+
+            Skin = skin;
             ComboColours = new BindableList<Colour4>();
 
             if (Skin.Configuration.ComboColours is IReadOnlyList<Color4> comboColours)
@@ -67,6 +69,7 @@ namespace osu.Game.Screens.Edit
             for (int i = 0; i < ComboColours.Count; ++i)
                 Skin.Configuration.CustomComboColours.Add(ComboColours[(ComboColours.Count + i - 1) % ComboColours.Count]);
             InvokeSkinChanged();
+            editorBeatmap.SaveState();
         }
 
         #endregion