diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 4879b3bb..b07fd52f 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -976,6 +976,10 @@ class ConversationViewController: BaseViewController {
                 }
             }
 
+            messageToolbar.giveUpMentionUserAction = { [weak self] in
+                self?.mentionView.hide()
+            }
+
             // 在这里才尝试恢复 messageToolbar 的状态，因为依赖 stateTransitionAction
     
             func tryRecoverMessageToolBar() {
diff --git a/Yep/Views/MessageToolbar/MessageToolbar.swift b/Yep/Views/MessageToolbar/MessageToolbar.swift
index 008e5b08..f4d7ccae 100644
--- a/Yep/Views/MessageToolbar/MessageToolbar.swift
+++ b/Yep/Views/MessageToolbar/MessageToolbar.swift
@@ -144,6 +144,7 @@ class MessageToolbar: UIToolbar {
     var notifyTypingAction: (() -> Void)?
 
     var tryMentionUserAction: ((usernamePrefix: String) -> Void)?
+    var giveUpMentionUserAction: (() -> Void)?
 
     var textSendAction: ((messageToolBar: MessageToolbar) -> Void)?
 
@@ -494,8 +495,12 @@ extension MessageToolbar: UITextViewDelegate {
                     let usernamePrefix = lastPart.substringFromIndex(lastPart.startIndex.advancedBy(1))
                     mentionUsernameRange = text.rangeOfString(lastPart)
                     tryMentionUserAction?(usernamePrefix: usernamePrefix)
+
+                    return
                 }
             }
+
+            giveUpMentionUserAction?()
         }
     }
 }