diff --git a/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
index 8bacbf4cc9..1994083805 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
@@ -33,7 +33,18 @@ namespace osu.Game.Beatmaps.Drawables
 
         public BeatmapSetInfo BeatmapSet;
 
-        public bool Hidden;
+        private bool hidden;
+        public bool Hidden
+        {
+            get { return hidden; }
+            set
+            {
+                hidden = value;
+                Header.Alpha = hidden ? 0 : 1;
+                if (hidden)
+                    State = BeatmapGroupState.Collapsed;
+            }
+        }
 
         public BeatmapGroupState State
         {
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index edfe1bc3a5..3518e94f70 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -213,7 +213,6 @@ namespace osu.Game.Screens.Select
                     {
                         changed = changed && !beatmapGroup.Hidden;
                         beatmapGroup.Hidden = false;
-                        beatmapGroup.Header.Alpha = 1;
                         if (newSelection == null || beatmapGroup.BeatmapSet.OnlineBeatmapSetID == Beatmap.BeatmapSetInfo.OnlineBeatmapSetID)
                             newSelection = beatmapGroup;
                     }
@@ -221,9 +220,6 @@ namespace osu.Game.Screens.Select
                     {
                         changed = changed && beatmapGroup.Hidden;
                         beatmapGroup.Hidden = true;
-                        beatmapGroup.Header.Alpha = 0;
-                        beatmapGroup.Header.Masking = false;
-                        beatmapGroup.State = BeatmapGroupState.Collapsed;
                     }
                 }
                 if (newSelection != null)