diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs index 98dd08da3..82653c77a 100644 --- a/src/zen/kbs/ZenKeyboardShortcuts.mjs +++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs @@ -44,6 +44,10 @@ const KEYCODE_MAP = { SCROLL_LOCK: "VK_SCROLL", }; +const REVERSE_KEYCODE_MAP = Object.fromEntries( + Object.entries(KEYCODE_MAP).map(([k, v]) => [v, k]) +); + const defaultKeyboardGroups = { windowAndTabManagement: [ "zen-window-new-shortcut", @@ -1507,9 +1511,11 @@ window.gZenKeyboardShortcutsManager = { continue; } + const keyNameOrCode = targetShortcut.getKeyNameOrCode(); + const key = REVERSE_KEYCODE_MAP[keyNameOrCode] ?? keyNameOrCode; if ( targetShortcut.getModifiers().equals(modifiers) && - targetShortcut.getKeyNameOrCode()?.toLowerCase() == realShortcut + key?.toLowerCase() == realShortcut ) { return { hasConflicts: true,