diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 9847903c48..2640f99ea5 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         protected override bool IsLoading => settings.IsLoading; // should probably be replaced with an OngoingOperationTracker.
 
-        protected override void SelectBeatmap() => EditPlaylist();
+        protected override void SelectBeatmap() => settings.SelectBeatmap();
 
         protected override OnlinePlayComposite CreateSettings()
             => settings = new MatchSettings
@@ -61,6 +61,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             private DrawableRoomPlaylist playlist;
             private OsuSpriteText playlistLength;
 
+            private PurpleTriangleButton editPlaylistButton;
+
             [Resolved(CanBeNull = true)]
             private IRoomManager manager { get; set; }
 
@@ -209,7 +211,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                     },
                                                                     new Drawable[]
                                                                     {
-                                                                        new PurpleTriangleButton
+                                                                        editPlaylistButton = new PurpleTriangleButton
                                                                         {
                                                                             RelativeSizeAxes = Axes.X,
                                                                             Height = 40,
@@ -302,6 +304,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 ApplyButton.Enabled.Value = hasValidSettings;
             }
 
+            public void SelectBeatmap() => editPlaylistButton.TriggerClick();
+
             private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
                 playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";