diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js
--- a/native/chat/chat-input-bar.react.js
+++ b/native/chat/chat-input-bar.react.js
@@ -691,6 +691,9 @@
 
   updateText = (text: string) => {
     this.setState({ text, textEdited: true });
+    if (this.isEditMode()) {
+      return;
+    }
     this.saveDraft(text);
   };
 
@@ -789,7 +792,14 @@
   };
 
   onPressExitEditMode = () => {
+    this.exitEditMode();
+  };
+
+  exitEditMode = () => {
     this.props.inputState?.setEditedMessageID(null);
+    this.updateText(this.props.draft);
+    this.focusAndUpdateButtonsVisibility();
+    this.updateSendButton(this.props.draft);
   };
 
   onPressJoin = () => {