From 455c06c881e21937d172bf5dc5e2ee53bece5cc9 Mon Sep 17 00:00:00 2001
From: Taras <Taras.Fomin@gmail.com>
Date: Wed, 29 Jul 2026 10:41:42 +0300
Subject: [PATCH 1/2] move context menus setting to appearance

---
 FORK.md                                       |  2 +-
 .../components/settings/SettingsPanels.tsx    | 84 +++++++++----------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/FORK.md b/FORK.md
index 0ea269c1872..61ad6d22657 100644
--- a/FORK.md
+++ b/FORK.md
@@ -56,7 +56,7 @@ This repository is a fork of `pingdotgg/t3code`. Keep this file focused on fork
 
 ### UX Changes
 
-- Desktop context-menu style is configurable.
+- Desktop context-menu style is configurable from Appearance settings.
 - The sidebar follows the active thread when it appears or when navigation originates elsewhere.
 - Sidebar environments can be hidden or shown dynamically from the project toolbar.
 - Threads can be archived with middle click.
diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx
index d5f19ac804b..cc6d6f47585 100644
--- a/apps/web/src/components/settings/SettingsPanels.tsx
+++ b/apps/web/src/components/settings/SettingsPanels.tsx
@@ -632,6 +632,48 @@ export function AppearanceSettingsPanel() {
           }
         />
 
+        <SettingsRow
+          title="Context menus"
+          description="Default uses native desktop menus on macOS and custom menus elsewhere."
+          resetAction={
+            settings.contextMenuStyle !== DEFAULT_UNIFIED_SETTINGS.contextMenuStyle ? (
+              <SettingResetButton
+                label="context menu style"
+                onClick={() =>
+                  updateSettings({
+                    contextMenuStyle: DEFAULT_UNIFIED_SETTINGS.contextMenuStyle,
+                  })
+                }
+              />
+            ) : null
+          }
+          control={
+            <Select
+              value={settings.contextMenuStyle}
+              onValueChange={(value) => {
+                if (value === "default" || value === "native" || value === "custom") {
+                  updateSettings({ contextMenuStyle: value });
+                }
+              }}
+            >
+              <SelectTrigger className="w-full sm:w-40" aria-label="Context menu style">
+                <SelectValue>{CONTEXT_MENU_STYLE_LABELS[settings.contextMenuStyle]}</SelectValue>
+              </SelectTrigger>
+              <SelectPopup align="end" alignItemWithTrigger={false}>
+                <SelectItem hideIndicator value="default">
+                  {CONTEXT_MENU_STYLE_LABELS.default}
+                </SelectItem>
+                <SelectItem hideIndicator value="native">
+                  {CONTEXT_MENU_STYLE_LABELS.native}
+                </SelectItem>
+                <SelectItem hideIndicator value="custom">
+                  {CONTEXT_MENU_STYLE_LABELS.custom}
+                </SelectItem>
+              </SelectPopup>
+            </Select>
+          }
+        />
+
         {showEnvironmentIdentification ? (
           <SettingsRow
             title="Environment identification"
@@ -822,48 +864,6 @@ export function GeneralSettingsPanel() {
           }
         />
 
-        <SettingsRow
-          title="Context menus"
-          description="Default uses native desktop menus on macOS and custom menus elsewhere."
-          resetAction={
-            settings.contextMenuStyle !== DEFAULT_UNIFIED_SETTINGS.contextMenuStyle ? (
-              <SettingResetButton
-                label="context menu style"
-                onClick={() =>
-                  updateSettings({
-                    contextMenuStyle: DEFAULT_UNIFIED_SETTINGS.contextMenuStyle,
-                  })
-                }
-              />
-            ) : null
-          }
-          control={
-            <Select
-              value={settings.contextMenuStyle}
-              onValueChange={(value) => {
-                if (value === "default" || value === "native" || value === "custom") {
-                  updateSettings({ contextMenuStyle: value });
-                }
-              }}
-            >
-              <SelectTrigger className="w-full sm:w-40" aria-label="Context menu style">
-                <SelectValue>{CONTEXT_MENU_STYLE_LABELS[settings.contextMenuStyle]}</SelectValue>
-              </SelectTrigger>
-              <SelectPopup align="end" alignItemWithTrigger={false}>
-                <SelectItem hideIndicator value="default">
-                  {CONTEXT_MENU_STYLE_LABELS.default}
-                </SelectItem>
-                <SelectItem hideIndicator value="native">
-                  {CONTEXT_MENU_STYLE_LABELS.native}
-                </SelectItem>
-                <SelectItem hideIndicator value="custom">
-                  {CONTEXT_MENU_STYLE_LABELS.custom}
-                </SelectItem>
-              </SelectPopup>
-            </Select>
-          }
-        />
-
         <SettingsRow
           title="Hide whitespace changes"
           description="Set whether the diff panel ignores whitespace-only edits by default."

From 227238bf2900ac06ab23eab06a8b7e2d362798d6 Mon Sep 17 00:00:00 2001
From: Taras <Taras.Fomin@gmail.com>
Date: Wed, 29 Jul 2026 11:04:33 +0300
Subject: [PATCH 2/2] docs: document context menu setting

---
 docs/README.md             | 1 +
 docs/user/context-menus.md | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 docs/user/context-menus.md

diff --git a/docs/README.md b/docs/README.md
index fe473094bbc..767d35781de 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,6 +8,7 @@
   - [Server updates](./architecture/server-updates.md)
 - User guides
   - [Background service](./user/background-service.md)
+  - [Context menus](./user/context-menus.md)
   - [Remote access](./user/remote-access.md)
   - [Keeping T3 Code in sync](./user/server-updates.md)
   - [Keybindings](./user/keybindings.md)
diff --git a/docs/user/context-menus.md b/docs/user/context-menus.md
new file mode 100644
index 00000000000..dbbd47099ad
--- /dev/null
+++ b/docs/user/context-menus.md
@@ -0,0 +1,8 @@
+# Context menus
+
+Open **Settings** → **Appearance** and use **Context menus** to choose how menus are
+displayed:
+
+- **Default** uses native desktop menus on macOS and custom menus elsewhere.
+- **Native** uses operating system menus in the desktop app. Browser clients use custom menus.
+- **Custom** uses T3 Code menus on every client.