From e0330256574120859f08be92fc154ddac6d4a0c0 Mon Sep 17 00:00:00 2001 From: LukeGus Date: Fri, 6 Nov 2026 20:48:16 -0600 Subject: [PATCH] fix: only run shell keybinding defaults from the shell --- src/ui/shell/controller/use-shell-keybindings.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ui/shell/controller/use-shell-keybindings.ts b/src/ui/shell/controller/use-shell-keybindings.ts index 407343378..8352429ad 100644 --- a/src/ui/shell/controller/use-shell-keybindings.ts +++ b/src/ui/shell/controller/use-shell-keybindings.ts @@ -20,6 +20,7 @@ import { GLOBAL_KEYBINDING_EVENT, getKeybindingAction, listKeybindingDefaults, + SHELL_KEYBINDING_ACTION_IDS, runKeybindingAction, } from "@/shell/keybinding-registry"; import { globalShortcutHandler } from "@/lib/global-shortcut-handler"; @@ -121,11 +122,14 @@ export function useShellKeybindings({ return; } + // Plugins run their own defaults, so only the shell's are handled here. const defaultBinding = listKeybindingDefaults().find( (entry) => + SHELL_KEYBINDING_ACTION_IDS.includes(entry.id) && !customBindings.some( (custom) => custom.overridesDefaultId === entry.id, - ) && eventMatchesCombo(event, entry.combo), + ) && + eventMatchesCombo(event, entry.combo), ); if (!defaultBinding || !getKeybindingAction(defaultBinding.id)) return; event.preventDefault();