diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 7706e33179..119635ccd5 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// <summary>
     /// Represents a part of the summary timeline..
     /// </summary>
-    public abstract class TimelinePart : Container
+    public class TimelinePart : Container
     {
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
         protected override Container<Drawable> Content => timeline;
 
-        protected TimelinePart()
+        public TimelinePart()
         {
             AddInternal(timeline = new Container { RelativeSizeAxes = Axes.Both });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 39ec42ba96..a8fb87c1b0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -40,9 +40,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private IAdjustableClock adjustableClock { get; set; }
 
-        [Resolved]
-        private HitObjectComposer composer { get; set; }
-
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
@@ -77,7 +74,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 dragBox.CreateProxy()
             };
 
-            foreach (var obj in composer.HitObjects)
+            foreach (var obj in beatmap.HitObjects)
                 addBlueprintFor(obj);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index b20f2fa11d..12909f257d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -14,15 +14,19 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    internal class TimelineHitObjectDisplay : TimelinePart
+    internal class TimelineHitObjectDisplay : BlueprintContainer
     {
         private EditorBeatmap beatmap { get; }
 
+        private readonly TimelinePart content;
+
         public TimelineHitObjectDisplay(EditorBeatmap beatmap)
         {
             RelativeSizeAxes = Axes.Both;
 
             this.beatmap = beatmap;
+
+            AddInternal(content = new TimelinePart());
         }
 
         [BackgroundDependencyLoader]
@@ -42,15 +46,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void remove(HitObject h)
         {
-            foreach (var d in Children.OfType<TimelineHitObjectRepresentation>().Where(c => c.HitObject == h))
+            foreach (var d in content.OfType<TimelineHitObjectRepresentation>().Where(c => c.HitObject == h))
                 d.Expire();
         }
 
         private void add(HitObject h)
         {
-            var yOffset = Children.Count(d => d.X == h.StartTime);
+            var yOffset = content.Count(d => d.X == h.StartTime);
 
-            Add(new TimelineHitObjectRepresentation(h) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS });
+            content.Add(new TimelineHitObjectRepresentation(h) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS });
         }
 
         private class TimelineHitObjectRepresentation : CompositeDrawable