diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index d1e2f20755..fb17291bec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -49,7 +49,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                         RelativeSizeAxes = Axes.X,
                         Height = 40,
                         Text = "Select beatmap",
-                        Action = () => matchSubScreen.Push(new MultiplayerMatchSongSelect()),
+                        Action = () =>
+                        {
+                            if (matchSubScreen.IsCurrentScreen())
+                                matchSubScreen.Push(new MultiplayerMatchSongSelect());
+                        },
                         Alpha = 0
                     }
                 }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 092394446b..45aca24ab2 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -230,7 +230,11 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 settingsOverlay = new PlaylistsMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
-                    EditPlaylist = () => this.Push(new PlaylistsSongSelect()),
+                    EditPlaylist = () =>
+                    {
+                        if (this.IsCurrentScreen())
+                            this.Push(new PlaylistsSongSelect());
+                    },
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
             });