diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
index 8168faa106..b8f5ee5e86 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
@@ -11,10 +11,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneModDisplay : OsuTestScene
     {
-        [TestCase(ExpansionMode.ExpandOnHover)]
-        [TestCase(ExpansionMode.AlwaysExpanded)]
-        [TestCase(ExpansionMode.AlwaysContracted)]
-        public void TestMode(ExpansionMode mode)
+        [Test]
+        public void TestMode([Values] ExpansionMode mode)
         {
             AddStep("create mod display", () =>
             {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 3485d7fbc3..1e76c33fca 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -416,7 +416,6 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    AutoSizeAxes = Axes.Both,
                     Position = new Vector2(-5, 25),
                     Current = { BindTarget = modSelect.SelectedMods }
                 }
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index fd1150650c..4265a83ce1 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -172,7 +172,6 @@ namespace osu.Game.Screens.Play
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
-                            AutoSizeAxes = Axes.Both,
                             Margin = new MarginPadding { Top = 20 },
                             Current = mods
                         },
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 2f7ca74372..36127292c3 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -15,24 +15,26 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class ModDisplay : Container, IHasCurrentValue<IReadOnlyList<Mod>>
+    /// <summary>
+    /// Displays a single-line horizontal auto-sized flow of mods.
+    /// </summary>
+    public class ModDisplay : CompositeDrawable, IHasCurrentValue<IReadOnlyList<Mod>>
     {
         private const int fade_duration = 1000;
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
-        private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
+        private readonly BindableWithCurrent<IReadOnlyList<Mod>> current = new BindableWithCurrent<IReadOnlyList<Mod>>();
 
         public Bindable<IReadOnlyList<Mod>> Current
         {
-            get => current;
+            get => current.Current;
             set
             {
                 if (value == null)
                     throw new ArgumentNullException(nameof(value));
 
-                current.UnbindBindings();
-                current.BindTo(value);
+                current.Current = value;
             }
         }
 
@@ -42,22 +44,10 @@ namespace osu.Game.Screens.Play.HUD
         {
             AutoSizeAxes = Axes.Both;
 
-            Child = new FillFlowContainer
+            InternalChild = iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
             {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
                 AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Vertical,
-                Children = new Drawable[]
-                {
-                    iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                    },
-                },
+                Direction = FillDirection.Horizontal,
             };
         }
 
@@ -71,22 +61,23 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            Current.BindValueChanged(mods =>
-            {
-                iconsContainer.Clear();
-
-                if (mods.NewValue != null)
-                {
-                    foreach (Mod mod in mods.NewValue)
-                        iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
-
-                    appearTransform();
-                }
-            }, true);
+            Current.BindValueChanged(updateDisplay, true);
 
             iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
 
+        private void updateDisplay(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        {
+            iconsContainer.Clear();
+
+            if (mods.NewValue == null) return;
+
+            foreach (Mod mod in mods.NewValue)
+                iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+
+            appearTransform();
+        }
+
         private void appearTransform()
         {
             expand();
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ffe03815f5..2cf2555b3e 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -282,7 +282,6 @@ namespace osu.Game.Screens.Play
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
-            AutoSizeAxes = Axes.Both,
         };
 
         protected PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();