diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 90b9808da5..0dc5d8074d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Select
 
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            if (groups.Count == 0)
+            if (groups.All(g => g.State == BeatmapGroupState.Hidden))
             {
                 selectedGroup = null;
                 selectedPanel = null;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 0cfd3f3463..9e1d230124 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -235,6 +235,13 @@ namespace osu.Game.Screens.Select
                 changeBackground(Beatmap.Value);
             };
 
+            selectionChangedDebounce?.Cancel();
+
+            if (beatmap?.Equals(beatmapNoDebounce) == true)
+                return;
+
+            beatmapNoDebounce = beatmap;
+
             if (beatmap == null)
             {
                 if (!Beatmap.IsDefault)
@@ -242,18 +249,13 @@ namespace osu.Game.Screens.Select
             }
             else
             {
-                selectionChangedDebounce?.Cancel();
-
-                if (beatmap.Equals(beatmapNoDebounce))
-                    return;
+                ruleset.Value = beatmap.Ruleset;
 
                 if (beatmap.BeatmapSetInfoID == beatmapNoDebounce?.BeatmapSetInfoID)
                     sampleChangeDifficulty.Play();
                 else
                     sampleChangeBeatmap.Play();
 
-                beatmapNoDebounce = beatmap;
-
                 if (beatmap == Beatmap.Value.BeatmapInfo)
                     performLoad();
                 else