diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 4a1bf392f..81c6bd260 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -811,6 +811,8 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
 - (void)viewWillDisappear:(BOOL)animated
 {
     [self.attachmentView viewWillDisappear:animated];
+
+    [self endEditingTextMessage];
 }
 
 - (nullable NSString *)textInputPrimaryLanguage