diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py
index 86ba87ef..d5c1beaf 100644
--- a/scripts/wk/cfg/setup.py
+++ b/scripts/wk/cfg/setup.py
@@ -13,8 +13,8 @@ BROWSER_PATHS = {
 FAB_TIMEFRAME = 14 # If it's been at least this many days don't prompt for an AV scan
 DISABLED_ENTRIES_WINDOWS_11 = {
   # Group Name: Option Name
-  'Install Software': 'Open Shell',
-  'Configure System': 'Open Shell',
+  'Install Software': 'Open-Shell',
+  'Configure System': 'Open-Shell',
   }
 LIBREOFFICE_XCU_DATA = '''<?xml version="1.0" encoding="UTF-8"?>
 <oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index 1ea2c37d..98ff3277 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -247,7 +247,7 @@ def load_preset(menus, presets, title, enable_menu_exit=True):
   print('')
   if selection[0] == 'Default':
     # OpenShell
-    if ask('Install OpenShell?'):
+    if OS_VERSION != 11 and ask('Install OpenShell?'):
       menus['Install Software'].options['Open-Shell']['Selected'] = True
       menus['Configure System'].options['Open-Shell']['Selected'] = True