From e920db2148865d3bbdca6edcba1bec7d055cd77f Mon Sep 17 00:00:00 2001
From: Josh Perez <josh.p@signal.org>
Date: Mon, 16 Oct 2023 15:34:25 -0400
Subject: [PATCH] Focus keyboard shortcut for edit message

---
 ts/hooks/useKeyboardShortcuts.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ts/hooks/useKeyboardShortcuts.tsx b/ts/hooks/useKeyboardShortcuts.tsx
index 4f77c5dcc4..24e57c07b6 100644
--- a/ts/hooks/useKeyboardShortcuts.tsx
+++ b/ts/hooks/useKeyboardShortcuts.tsx
@@ -270,6 +270,11 @@ export function useEditLastMessageSent(
 
       const key = KeyboardLayout.lookup(ev);
 
+      const { shiftKey } = ev;
+      if (shiftKey || isCtrlOrAlt(ev)) {
+        return false;
+      }
+
       if (key === 'ArrowUp') {
         const value = maybeEditMessage();
         if (value) {