diff --git a/LANCommander.Launcher/UI/Components/CheckboxButtonGroup.razor b/LANCommander.Launcher/UI/Components/CheckboxButtonGroup.razor
index 2343dca9..8eb31218 100644
--- a/LANCommander.Launcher/UI/Components/CheckboxButtonGroup.razor
+++ b/LANCommander.Launcher/UI/Components/CheckboxButtonGroup.razor
@@ -62,6 +62,12 @@
             Selected = false,
             DataItem = i
         });
+
+        // Sync the incoming Selected parameter with internal state.
+        if (Selected != null)
+        {
+            SelectedKeys = Selected.Select(item => KeySelector.Invoke(item).ToString()).ToList();
+        }
     }
 
     async Task Select(CheckboxButtonGroupItem<TItem> item)