diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json
index fb54383d..f95f3a1d 100644
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -80,10 +80,10 @@
   },
   "shuffle": {
     "choices": [
-      "full",
       "vanilla",
       "simple",
       "restricted",
+      "full",
       "crossed",
       "insanity",
       "restricted_legacy",
@@ -304,9 +304,9 @@
   },
   "saveonexit": {
     "choices": [
-      "never",
       "ask",
-      "always"
+      "always",
+      "never"
     ]
   },
   "outputname": {}
diff --git a/source/gui/widgets.py b/source/gui/widgets.py
index 7697328f..f5512c89 100644
--- a/source/gui/widgets.py
+++ b/source/gui/widgets.py
@@ -99,9 +99,9 @@ def make_selectbox(self, parent, label, options, storageVar, manager, managerAtt
     values = self.selectbox.options["values"]
     if default in values:
         idx = values.index(default)
-    default = labels[idx]
-    self.labelVar.set(default)
-    self.selectbox["menu"].entryconfigure(idx,label=default)
+    self.labelVar.set(labels[idx])
+    self.storageVar.set(values[idx])
+    self.selectbox["menu"].entryconfigure(idx,label=labels[idx])
 
     if managerAttrs is not None and "selectbox" in managerAttrs:
         self.selectbox.pack(managerAttrs["selectbox"])