diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 75caa3c9a3..c6f2b61049 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -265,6 +265,38 @@ namespace osu.Game.Screens.Select
 
             foreach (int i in changes.InsertedIndices)
                 UpdateBeatmapSet(sender[i].Detach());
+
+            if (changes.DeletedIndices.Length > 0)
+            {
+                // To handle the beatmap update flow, attempt to track selection changes across delete-insert transactions.
+                // When an update occurs, the previous beatmap set is either soft or hard deleted.
+                // Check if the current selection was potentially deleted by re-querying its validity.
+                bool selectedSetMarkedDeleted = realm.Run(r => r.Find<BeatmapSetInfo>(SelectedBeatmapSet.ID))?.DeletePending != false;
+
+                if (selectedSetMarkedDeleted)
+                {
+                    // If it is no longer valid, make the bold assumption that an updated version will be available in the modified indices.
+                    // This relies on the full update operation being in a single transaction, so please don't change that.
+                    foreach (int i in changes.NewModifiedIndices)
+                    {
+                        var beatmapSetInfo = sender[i];
+
+                        foreach (var beatmapInfo in beatmapSetInfo.Beatmaps)
+                        {
+                            // Best effort matching. We can't use ID because in the update flow a new version will get its own GUID.
+                            bool selectionMatches =
+                                ((IBeatmapMetadataInfo)beatmapInfo.Metadata).Equals(SelectedBeatmapInfo.Metadata)
+                                && beatmapInfo.DifficultyName == SelectedBeatmapInfo.DifficultyName;
+
+                            if (selectionMatches)
+                            {
+                                SelectBeatmap(beatmapInfo);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         private void beatmapsChanged(IRealmCollection<BeatmapInfo> sender, ChangeSet changes, Exception error)