diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 7443603c8b..f104bf9a37 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -179,11 +179,11 @@ public void SelectRandom()
 
         public void Filter(FilterCriteria newCriteria = null, bool debounce = true)
         {
-            if (!IsLoaded) return;
-
             if (newCriteria != null)
                 criteria = newCriteria;
 
+            if (!IsLoaded) return;
+
             Action perform = delegate
             {
                 filterTask = null;
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 26daddc3a9..6d92b35993 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -173,9 +173,9 @@ private void load(OsuColour colours, OsuGame osu)
         {
             sortTabs.AccentColour = colours.GreenLight;
 
-            if (osu != null)
-                playMode.BindTo(osu.PlayMode);
+            if (osu != null) playMode.BindTo(osu.PlayMode);
             playMode.ValueChanged += val => FilterChanged?.Invoke(CreateCriteria());
+            playMode.TriggerChange();
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;