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: {