From 7857bf2da1a14aa5d0f42b6b36cecab216d3dd68 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Dec 2021 16:21:32 +0000
Subject: [PATCH] Prevent escape to cancel edit from also scrolling to bottom
 (#7380)

---
 src/components/views/rooms/EditMessageComposer.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx
index f216a549fe..36e2e5bf2d 100644
--- a/src/components/views/rooms/EditMessageComposer.tsx
+++ b/src/components/views/rooms/EditMessageComposer.tsx
@@ -160,9 +160,11 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
         switch (action) {
             case MessageComposerAction.Send:
                 this.sendEdit();
+                event.stopPropagation();
                 event.preventDefault();
                 break;
             case MessageComposerAction.CancelEditing:
+                event.stopPropagation();
                 this.cancelEdit();
                 break;
             case MessageComposerAction.EditPrevMessage: {