diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs
index 260f2d0998..9ffc5a183a 100644
--- a/osu.Game/Screens/Select/CarouselContainer.cs
+++ b/osu.Game/Screens/Select/CarouselContainer.cs
@@ -176,6 +176,7 @@ namespace osu.Game.Screens.Select
             if (SelectedGroup != null && SelectedGroup != group && SelectedGroup.State != BeatmapGroupState.Hidden)
                 SelectedGroup.State = BeatmapGroupState.Collapsed;
 
+            group.State = BeatmapGroupState.Expanded;
             SelectedGroup = group;
             panel.State = PanelSelectedState.Selected;
             SelectedPanel = panel;
@@ -220,6 +221,20 @@ namespace osu.Game.Screens.Select
                 default:
                     throw new NotImplementedException();
             }
+            scrollableContent.Clear(false);
+            lifetime.Clear();
+            foreach (BeatmapGroup group in groups)
+            {
+                group.Header.Depth = -scrollableContent.Children.Count();
+                scrollableContent.Add(group.Header);
+
+                foreach (BeatmapPanel panel in group.BeatmapPanels)
+                {
+                    panel.Depth = -scrollableContent.Children.Count();
+                    scrollableContent.Add(panel);
+                }
+            }
+            SelectGroup(groups.FirstOrDefault(), groups.First().BeatmapPanels.FirstOrDefault());
         }
 
         private static float offsetX(float dist, float halfHeight)