diff --git a/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
index eed7e9369e..3f5fe58ab5 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
@@ -35,14 +35,8 @@ namespace osu.Game.Beatmaps.Drawables
                 switch (state)
                 {
                     case BeatmapGroupState.Expanded:
-                        //if (!difficulties.Children.All(d => IsLoaded))
-                        //    Task.WhenAll(difficulties.Children.Select(d => d.Preload(Game))).ContinueWith(t => difficulties.Show());
-                        //else
                         foreach (BeatmapPanel panel in BeatmapPanels)
-                        {
-                            panel.Hidden = false;
                             panel.FadeIn(250);
-                        }
 
                         Header.State = PanelSelectedState.Selected;
                         if (SelectedPanel != null)
@@ -54,11 +48,7 @@ namespace osu.Game.Beatmaps.Drawables
                             SelectedPanel.State = PanelSelectedState.NotSelected;
 
                         foreach (BeatmapPanel panel in BeatmapPanels)
-                        {
-                            panel.Hidden = true;
                             panel.FadeOut(250);
-                        }
-
                         break;
                 }
             }
@@ -76,6 +66,7 @@ namespace osu.Game.Beatmaps.Drawables
 
             BeatmapPanels = beatmap.BeatmapSetInfo.Beatmaps.Select(b => new BeatmapPanel(b)
             {
+                Alpha = 0,
                 GainedSelection = panelGainedSelection,
                 RelativeSizeAxes = Axes.X,
             }).ToList();
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
index 9ab9aaf9f5..a8bf8518d8 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
@@ -27,7 +27,6 @@ namespace osu.Game.Beatmaps.Drawables
         public BeatmapSetHeader(WorkingBeatmap beatmap)
         {
             this.beatmap = beatmap;
-            Hidden = false;
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Beatmaps/Drawables/Panel.cs b/osu.Game/Beatmaps/Drawables/Panel.cs
index cef25d24a5..9aa59f022f 100644
--- a/osu.Game/Beatmaps/Drawables/Panel.cs
+++ b/osu.Game/Beatmaps/Drawables/Panel.cs
@@ -4,6 +4,7 @@
 using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using OpenTK;
 using OpenTK.Graphics;
@@ -14,7 +15,8 @@ namespace osu.Game.Beatmaps.Drawables
     {
         public const float MAX_HEIGHT = 80;
 
-        public bool Hidden = true;
+        public bool Hidden => Alpha == 0 && Transforms.Count == 0;
+
         private Container nestedContainer;
 
         protected override Container<Drawable> Content => nestedContainer;