diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
index 9cc9ca87de..f2630caa83 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
@@ -71,8 +71,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     {
                         new Container
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
+                            AutoSizeAxes = Axes.Both,
                             Margin = new MarginPadding { Left = -(tile_icon_padding + tile_spacing / 2), Bottom = 10 },
                             Children = new Drawable[]
                             {
@@ -89,8 +88,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 },
                                 Difficulties = new DifficultiesContainer
                                 {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.Both,
                                     OnLostHover = () => showBeatmap(Beatmap.Value, withStarRating: false),
                                 },
                             }
@@ -144,6 +142,12 @@ namespace osu.Game.Overlays.BeatmapSet
             Beatmap.TriggerChange();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            Difficulties.MaximumSize = new Vector2(DrawWidth, float.MaxValue);
+        }
+
         private void updateDisplay()
         {
             Difficulties.Clear();