diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index fa9f569db4..7eb83bcf3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -4057,6 +4057,9 @@ public class ConversationParentFragment extends Fragment
     if (isSearchRequested) {
       searchViewItem.collapseActionView();
     }
+    if (inputPanel.inEditMessageMode()) {
+      inputPanel.exitEditMessageMode();
+    }
 
     MessageRecord messageRecord = conversationMessage.getMessageRecord();