diff --git a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
index 0a9719423c..f7be5f12e8 100644
--- a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
+++ b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
@@ -175,9 +175,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             AddStep($"click panel at index {index}", () =>
             {
-                Carousel.ChildrenOfType<T>()
+                Carousel.ChildrenOfType<UserTrackingScrollContainer>().Single()
+                        .ChildrenOfType<T>()
                         .Where(p => ((ICarouselPanel)p).Item?.IsVisible == true)
-                        .Reverse()
+                        .OrderBy(p => p.Y)
                         .ElementAt(index)
                         .TriggerClick();
             });