diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index ef189ed165..9890b8e8b6 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -12,7 +12,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -38,7 +37,7 @@ namespace osu.Game.Skinning.Editor
             base.LoadComplete();
 
             // track each target container on the current screen.
-            var targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            var targetContainers = target.ChildrenOfType<ISkinnableTarget>().ToArray();
 
             if (targetContainers.Length == 0)
             {
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 4d97b42e8e..ab3c24a1e2 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
+
 namespace osu.Game.Skinning
 {
     /// <summary>
@@ -8,16 +10,24 @@ namespace osu.Game.Skinning
     /// </summary>
     public interface ISkinnableTarget
     {
-        public SkinnableTarget Target { get; }
+        /// <summary>
+        /// The definition of this target.
+        /// </summary>
+        SkinnableTarget Target { get; }
+
+        /// <summary>
+        /// A bindable list of components which are being tracked by this skinnable target.
+        /// </summary>
+        IBindableList<ISkinnableComponent> Components { get; }
 
         /// <summary>
         /// Reload this target from the current skin.
         /// </summary>
-        public void Reload();
+        void Reload();
 
         /// <summary>
         /// Add the provided item to this target.
         /// </summary>
-        public void Add(ISkinnableComponent drawable);
+        void Add(ISkinnableComponent drawable);
     }
 }