diff --git a/scripts/auto_setup.py b/scripts/auto_setup.py
index 910e1203..8b1b40e7 100644
--- a/scripts/auto_setup.py
+++ b/scripts/auto_setup.py
@@ -37,12 +37,12 @@ BASE_MENUS = {
       MenuEntry('ESET NOD32 AV (MSP)',      'auto_install_eset_nod32_av_msp', selected=False),
       MenuEntry('Firefox',                  'auto_install_firefox'),
       MenuEntry('LibreOffice',              'auto_install_libreoffice', selected=False),
-      MenuEntry('Open Shell',               'auto_install_open_shell'),
+      MenuEntry('Open-Shell',               'auto_install_open_shell', selected=False),
       MenuEntry('Software Bundle',          'auto_install_software_bundle'),
       ),
     'Configure System': (
       MenuEntry('Apply ITS Settings',       'auto_apply_its_settings'),
-      MenuEntry('Open Shell',               'auto_config_open_shell'),
+      MenuEntry('Open-Shell',               'auto_config_open_shell', selected=False),
       MenuEntry('Disable Fast Startup',     'auto_disable_fast_startup', selected=False),
       MenuEntry('Disable Telemetry',        'auto_shutup_10'),
       MenuEntry('Enable BSoD MiniDumps',    'auto_enable_bsod_minidumps'),
@@ -91,7 +91,7 @@ PRESETS = {
   'Additional User': {
     'Configure System': (
       'Configure Browsers',
-      'Open Shell',
+      'Open-Shell',
       'uBlock Origin',
       'Enable BSoD MiniDumps',
       'Enable RegBack',
diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index f1a62438..1ea2c37d 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -246,6 +246,11 @@ def load_preset(menus, presets, title, enable_menu_exit=True):
   print_standard(f'{title}')
   print('')
   if selection[0] == 'Default':
+    # OpenShell
+    if ask('Install OpenShell?'):
+      menus['Install Software'].options['Open-Shell']['Selected'] = True
+      menus['Configure System'].options['Open-Shell']['Selected'] = True
+
     # LibreOffice
     if ask('Install LibreOffice?'):
       menus['Install Software'].options['LibreOffice']['Selected'] = True