diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py
index 97d0bd5a..1b49897d 100644
--- a/scripts/wk/cfg/setup.py
+++ b/scripts/wk/cfg/setup.py
@@ -10,6 +10,11 @@ BROWSER_PATHS = {
   'Microsoft Edge': 'Microsoft/Edge/Application/msedge.exe',
   'Opera': 'Opera/launcher.exe',
   }
+DISABLED_ENTRIES_WINDOWS_11 = {
+  # Group Name: Option Name
+  '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">
 <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Impress MS PowerPoint 2007 XML</value></prop></item>
diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index c399b0c6..40ebb512 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -12,6 +12,7 @@ import sys
 from wk.cfg.main      import KIT_NAME_FULL
 from wk.cfg.setup     import (
   BROWSER_PATHS,
+  DISABLED_ENTRIES_WINDOWS_11,
   LIBREOFFICE_XCU_DATA,
   REG_CHROME_UBLOCK_ORIGIN,
   REG_WINDOWS_EXPLORER,
@@ -162,6 +163,11 @@ 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