diff --git a/ErsatzTV/Pages/MediaCardSelectionHelper.cs b/ErsatzTV/Pages/MediaCardSelectionHelper.cs
index d94b11db0..68e930102 100644
--- a/ErsatzTV/Pages/MediaCardSelectionHelper.cs
+++ b/ErsatzTV/Pages/MediaCardSelectionHelper.cs
@@ -10,11 +10,15 @@ public static class MediaCardSelectionHelper
         ISet<MediaCardViewModel> selectedItems,
         IEnumerable<MediaCardViewModel> cards)
     {
-        List<MediaCardViewModel> cardList = (cards ?? Enumerable.Empty<MediaCardViewModel>()).ToList();
-
         selectedItems.Clear();
-        selectedItems.UnionWith(cardList);
 
-        return cardList.LastOrDefault();
+        MediaCardViewModel last = default;
+        foreach (MediaCardViewModel card in cards ?? Enumerable.Empty<MediaCardViewModel>())
+        {
+            last = card;
+            selectedItems.Add(card);
+        }
+
+        return last;
     }
 }
diff --git a/ErsatzTV/Pages/MultiSelectBase.cs b/ErsatzTV/Pages/MultiSelectBase.cs
index 42fdb54f5..75f1ffe26 100644
--- a/ErsatzTV/Pages/MultiSelectBase.cs
+++ b/ErsatzTV/Pages/MultiSelectBase.cs
@@ -44,8 +44,6 @@ public class MultiSelectBase<T> : FragmentNavigationBase
     {
         MediaCardViewModel lastSelected = MediaCardSelectionHelper.SelectAllPageItems(SelectedItems, cards);
         _recentlySelected = Optional(lastSelected);
-
-        StateHasChanged();
     }
 
     protected void ClearSelection()