diff --git a/ts/hooks/useKeyboardShortcuts.tsx b/ts/hooks/useKeyboardShortcuts.tsx
index 4f77c5dcc..24e57c07b 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) {