diff --git a/osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs
index bd5772d3bb..87552c3f17 100644
--- a/osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual
         {
             AddStep("Show overlay", () => failOverlay.Show());
 
-            AddStep("Hover first button", () => failOverlay.Buttons.First().TriggerOnHover(null));
+            AddStep("Hover first button", () => failOverlay.Buttons.First().TriggerOnMouseMove(null));
             AddStep("Hide overlay", () => failOverlay.Hide());
 
             AddAssert("Overlay state is reset", () => !failOverlay.Buttons.Any(b => b.Selected));
@@ -162,7 +162,7 @@ namespace osu.Game.Tests.Visual
             var secondButton = pauseOverlay.Buttons.Skip(1).First();
 
             AddStep("Down arrow", () => pauseOverlay.TriggerOnKeyDown(null, new KeyDownEventArgs { Key = Key.Down }));
-            AddStep("Hover second button", () => secondButton.TriggerOnHover(null));
+            AddStep("Hover second button", () => secondButton.TriggerOnMouseMove(null));
             AddAssert("First button not selected", () => !pauseOverlay.Buttons.First().Selected);
             AddAssert("Second button selected", () => secondButton.Selected);
 
@@ -178,7 +178,7 @@ namespace osu.Game.Tests.Visual
 
             var secondButton = pauseOverlay.Buttons.Skip(1).First();
 
-            AddStep("Hover second button", () => secondButton.TriggerOnHover(null));
+            AddStep("Hover second button", () => secondButton.TriggerOnMouseMove(null));
             AddStep("Up arrow", () => pauseOverlay.TriggerOnKeyDown(null, new KeyDownEventArgs { Key = Key.Up }));
             AddAssert("Second button not selected", () => !secondButton.Selected);
             AddAssert("First button selected", () => pauseOverlay.Buttons.First().Selected);
@@ -195,7 +195,7 @@ namespace osu.Game.Tests.Visual
 
             var secondButton = pauseOverlay.Buttons.Skip(1).First();
 
-            AddStep("Hover second button", () => secondButton.TriggerOnHover(null));
+            AddStep("Hover second button", () => secondButton.TriggerOnMouseMove(null));
             AddStep("Unhover second button", () => secondButton.TriggerOnHoverLost(null));
             AddStep("Down arrow", () => pauseOverlay.TriggerOnKeyDown(null, new KeyDownEventArgs { Key = Key.Down }));
             AddAssert("First button selected", () => pauseOverlay.Buttons.First().Selected); // Initial state condition
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 6969cd915b..094c0331f4 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -263,6 +263,14 @@ namespace osu.Game.Screens.Play
 
         private class Button : DialogButton
         {
+            protected override bool OnHover(InputState state) => true;
+
+            protected override bool OnMouseMove(InputState state)
+            {
+                Selected.Value = true;
+                return base.OnMouseMove(state);
+            }
+
             protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
             {
                 if (args.Repeat || args.Key != Key.Enter || !Selected)
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index e877633ab3..b343998e11 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -194,7 +194,14 @@ namespace osu.Game.Screens.Select
             if (!Items.Any())
                 return;
 
-            int originalIndex = Items.IndexOf(selectedBeatmap?.Drawables.First());
+            DrawableCarouselItem drawable = null;
+
+            if (selectedBeatmap != null && (drawable = selectedBeatmap.Drawables.FirstOrDefault()) == null)
+                // if the selected beatmap isn't present yet, we can't correctly change selection.
+                // we can fix this by changing this method to not reference drawables / Items in the first place.
+                return;
+
+            int originalIndex = Items.IndexOf(drawable);
             int currentIndex = originalIndex;
 
             // local function to increment the index in the required direction, wrapping over extremities.