diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index f36cda9ed..be4246af5 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -236,6 +236,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
                 self.thread.setDraft(text, transaction: transaction)
             }
         }
+        inputAccessoryView?.resignFirstResponder()
     }
     
     override func viewDidDisappear(_ animated: Bool) {