diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 057f5e0b0..dea1978bf 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -429,12 +429,12 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
         Storage.write { transaction in
             self.thread.setDraft(text, transaction: transaction)
         }
-        self.resignFirstResponder()
     }
     
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         mediaCache.removeAllObjects()
+        self.resignFirstResponder()
     }
     
     override func appDidBecomeActive(_ notification: Notification) {