diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 904fd6ead6..207dc91ca5 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -10,7 +10,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.BeatmapSet;
@@ -45,25 +44,20 @@ public BeatmapSetOverlay()
             Info info;
             CommentsSection comments;
 
-            Child = new PopoverContainer
+            Child = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Child = new FillFlowContainer
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 20),
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 20),
-                    Children = new Drawable[]
+                    info = new Info(),
+                    new ScoresContainer
                     {
-                        info = new Info(),
-                        new ScoresContainer
-                        {
-                            Beatmap = { BindTarget = Header.HeaderContent.Picker.Beatmap }
-                        },
-                        comments = new CommentsSection()
-                    }
+                        Beatmap = { BindTarget = Header.HeaderContent.Picker.Beatmap }
+                    },
+                    comments = new CommentsSection()
                 }
             };
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogContent.cs b/osu.Game/Overlays/Changelog/ChangelogContent.cs
index 2b54df7226..e04133f2e4 100644
--- a/osu.Game/Overlays/Changelog/ChangelogContent.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogContent.cs
@@ -1,35 +1,24 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
 using System;
-using osu.Framework.Graphics.Cursor;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class ChangelogContent : PopoverContainer
+    public class ChangelogContent : FillFlowContainer
     {
-        public Action<APIChangelogBuild> BuildSelected;
+        public Action<APIChangelogBuild>? BuildSelected;
 
         public void SelectBuild(APIChangelogBuild build) => BuildSelected?.Invoke(build);
 
-        protected override Container<Drawable> Content { get; }
-
         public ChangelogContent()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-
-            base.Content.Add(Content = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical
-            });
+            Direction = FillDirection.Vertical;
         }
     }
 }