diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index eb7fc66a..8efdd50c 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -412,6 +412,8 @@ class ConversationViewController: BaseViewController {
 
         swipeUpView.hidden = true
 
+        conversationCollectionView.keyboardDismissMode = .OnDrag
+
         conversationCollectionView.alwaysBounceVertical = true
 
         conversationCollectionView.registerNib(UINib(nibName: chatStateCellIdentifier, bundle: nil), forCellWithReuseIdentifier: chatStateCellIdentifier)