From df6d3d4a24e64459fa7c7c66cc97a7cb3808013e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 19 Oct 2022 23:30:20 -0700
Subject: [PATCH] Fix Auto Setup selections under Windows 11

---
 scripts/wk/setup/win.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index 40ebb512..2fb76dd7 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -163,11 +163,6 @@ def build_menus(base_menus, title, presets):
   MENU_PRESETS.add_action('Quit')
   MENU_PRESETS.update()
 
-  # Disable entries incompatible with Windows 11
-  if OS_VERSION == 11:
-    for group_name, entry_name in DISABLED_ENTRIES_WINDOWS_11.items():
-      menus[group_name].options[entry_name]['Disabled'] = True
-
   # Done
   return menus
 
@@ -230,6 +225,12 @@ def load_preset(menus, presets, title, enable_menu_exit=True):
   # Re-enable Main Menu action if disabled
   MENU_PRESETS.actions['Main Menu'].update({'Disabled':False, 'Hidden':False})
 
+  # Disable entries incompatible with Windows 11
+  if OS_VERSION == 11:
+    for group_name, entry_name in DISABLED_ENTRIES_WINDOWS_11.items():
+      menus[group_name].options[entry_name]['Disabled'] = True
+      menus[group_name].options[entry_name]['Selected'] = False
+
 
 def run_auto_setup(base_menus, presets):
   """Run Auto Setup."""