diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 48bfe01d51..e5f3d93a7d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Screens.Select
                         if (skipDifficulties)
                             select(set);
                         else
-                            select(direction > 0 ? set.Beatmaps.First() : set.Beatmaps.Last());
+                            select(direction > 0 ? set.Beatmaps.First(b => !b.Filtered) : set.Beatmaps.Last(b => !b.Filtered));
                         return;
                 }
             }