diff --git a/osu.Game/Screens/SelectV2/SoloSongSelect.cs b/osu.Game/Screens/SelectV2/SoloSongSelect.cs
index a136e682c4..2c1eabc5fb 100644
--- a/osu.Game/Screens/SelectV2/SoloSongSelect.cs
+++ b/osu.Game/Screens/SelectV2/SoloSongSelect.cs
@@ -143,6 +143,9 @@ namespace osu.Game.Screens.SelectV2
 
         private void edit(BeatmapInfo beatmap)
         {
+            if (!this.IsCurrentScreen())
+                return;
+
             FinaliseSelection();
 
             // Forced refetch is important here to guarantee correct invalidation across all difficulties.
diff --git a/osu.Game/Screens/SelectV2/SongSelect.cs b/osu.Game/Screens/SelectV2/SongSelect.cs
index f4ba68cbd5..c753dd77cf 100644
--- a/osu.Game/Screens/SelectV2/SongSelect.cs
+++ b/osu.Game/Screens/SelectV2/SongSelect.cs
@@ -390,6 +390,9 @@ namespace osu.Game.Screens.SelectV2
 
         private void selectBeatmap(BeatmapInfo beatmap)
         {
+            if (!this.IsCurrentScreen())
+                return;
+
             if (beatmap.BeatmapSet!.Protected)
                 return;
 
@@ -674,6 +677,9 @@ namespace osu.Game.Screens.SelectV2
         /// </summary>
         public void SelectAndStart(BeatmapInfo beatmap)
         {
+            if (!this.IsCurrentScreen())
+                return;
+
             Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
             OnStart();
         }