diff --git a/lib/screens/settings/client_sections/client_settings_advanced.dart b/lib/screens/settings/client_sections/client_settings_advanced.dart
index c4465fa..a0f1272 100644
--- a/lib/screens/settings/client_sections/client_settings_advanced.dart
+++ b/lib/screens/settings/client_sections/client_settings_advanced.dart
@@ -26,7 +26,7 @@ List<Widget> buildClientSettingsAdvanced(BuildContext context, WidgetRef ref) {
             contentPadding: EdgeInsets.zero,
             value: selected,
             onChanged: (value) => tap(),
-            title: Text(type.name),
+            title: Text(type.label(context)),
           ),
         );
         ref.read(homeSettingsProvider.notifier).setViewSize(newItems.toSet());
diff --git a/lib/util/option_dialogue.dart b/lib/util/option_dialogue.dart
index 88acdfa..9544e6c 100644
--- a/lib/util/option_dialogue.dart
+++ b/lib/util/option_dialogue.dart
@@ -1,3 +1,5 @@
+import 'dart:collection';
+
 import 'package:flutter/material.dart';
 
 Future<List<T>> openMultiSelectOptions<T>(
@@ -40,6 +42,10 @@ Future<List<T>> openMultiSelectOptions<T>(
                       currentSelection = {item};
                     }
                   });
+                  currentSelection = SplayTreeSet.of(
+                    currentSelection,
+                    (a, b) => items.indexOf(a).compareTo(items.indexOf(b)),
+                  );
                   onChanged?.call(currentSelection.toList());
                 },
               );