From f3786e08165e304efab23579832e5b5159ce33f8 Mon Sep 17 00:00:00 2001
From: william light <wrl@lhiaudio.com>
Date: Sat, 26 Jul 2025 07:51:50 +0200
Subject: [PATCH] hotkeys: only match `just()` when no modifiers are held
 (#35535)

---
 app/javascript/mastodon/components/hotkeys/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/hotkeys/index.tsx b/app/javascript/mastodon/components/hotkeys/index.tsx
index b5e0de4c594..7e840ab9558 100644
--- a/app/javascript/mastodon/components/hotkeys/index.tsx
+++ b/app/javascript/mastodon/components/hotkeys/index.tsx
@@ -40,7 +40,11 @@ type KeyMatcher = (
  */
 function just(keyName: string): KeyMatcher {
   return (event) => ({
-    isMatch: normalizeKey(event.key) === keyName,
+    isMatch:
+      normalizeKey(event.key) === keyName &&
+      !event.altKey &&
+      !event.ctrlKey &&
+      !event.metaKey,
     priority: hotkeyPriority.singleKey,
   });
 }