diff --git a/bower.json b/bower.json
index c2c297f..3ba4cc4 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-mention",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "homepage": "https://github.com/angular-ui/ui-mention",
   "authors": [
     "AngularUI Team"
diff --git a/dist/mention.js b/dist/mention.js
index 19329f2..ed4c051 100644
--- a/dist/mention.js
+++ b/dist/mention.js
@@ -2,7 +2,7 @@
 
 var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })();
 
-angular.module('ui.mention', []).directive('uiMention', function ($q, $timeout) {
+angular.module('ui.mention', []).directive('uiMention', function ($q, $timeout, $document) {
   return {
     require: ['ngModel', 'uiMention'],
     controllerAs: '$mention',
@@ -173,8 +173,6 @@ angular.module('ui.mention', []).directive('uiMention', function ($q, $timeout)
       this.select = function () {
         var choice = arguments.length <= 0 || arguments[0] === undefined ? this.activeChoice : arguments[0];
 
-        if (!this.searching) return;
-
         // Add the mention
         this.mentions.push(choice);
 
@@ -310,6 +308,25 @@ angular.module('ui.mention', []).directive('uiMention', function ($q, $timeout)
         $scope.$apply();
       });
 
+      this.onMouseup = (function (event) {
+        var _this4 = this;
+
+        if (event.target == $element[0]) return;
+
+        $document.off('mouseup', this.onMouseup);
+
+        if (!this.searching) return;
+
+        // Let ngClick fire first
+        $scope.$evalAsync(function () {
+          _this4.cancel();
+        });
+      }).bind(this);
+
+      $element.on('focus', function (event) {
+        $document.on('mouseup', _this2.onMouseup);
+      });
+
       // Autogrow is mandatory beacuse the textarea scrolls away from highlights
       $element.on('input', this.autogrow);
       // Initialize autogrow height
diff --git a/dist/mention.min.js b/dist/mention.min.js
index 9eddf13..8cd634f 100644
--- a/dist/mention.min.js
+++ b/dist/mention.min.js
@@ -1 +1 @@
-"use strict";var _slicedToArray=function(){function sliceIterator(arr,i){var _arr=[],_n=!0,_d=!1,_e=void 0;try{for(var _s,_i=arr[Symbol.iterator]();!(_n=(_s=_i.next()).done)&&(_arr.push(_s.value),!i||_arr.length!==i);_n=!0);}catch(err){_d=!0,_e=err}finally{try{!_n&&_i["return"]&&_i["return"]()}finally{if(_d)throw _e}}return _arr}return function(arr,i){if(Array.isArray(arr))return arr;if(Symbol.iterator in Object(arr))return sliceIterator(arr,i);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}();angular.module("ui.mention",[]).directive("uiMention",function($q,$timeout){return{require:["ngModel","uiMention"],controllerAs:"$mention",link:function($scope,$element,$attrs,_ref){var _ref2=_slicedToArray(_ref,2),ngModel=_ref2[0],uiMention=_ref2[1];uiMention.init(ngModel)},controller:function($element,$scope,$attrs){var _this2=this;this.pattern=this.pattern||/(?:\s+|^)@(\w+(?: \w+)?)$/,this.$element=$element,this.choices=[],this.mentions=[];var ngModel;this.init=function(model){var _this=this;$attrs.ngTrim="false",ngModel=model,ngModel.$parsers.push(function(value){return _this.mentions=_this.mentions.filter(function(mention){return~value.indexOf(_this.label(mention))?value=value.replace(_this.label(mention),_this.encode(mention)):void 0}),_this.render(value),value}),ngModel.$formatters.push(function(){var value=arguments.length<=0||void 0===arguments[0]?"":arguments[0];return value=value.toString(),_this.mentions=_this.mentions.filter(function(mention){return~value.indexOf(_this.encode(mention))?(value=value.replace(_this.encode(mention),_this.label(mention)),!0):!1}),value}),ngModel.$render=function(){$element.val(ngModel.$viewValue||""),_this.render()}},this.render=function(){var html=arguments.length<=0||void 0===arguments[0]?ngModel.$modelValue:arguments[0];return html=(html||"").toString(),_this2.mentions.forEach(function(mention){html=html.replace(_this2.encode(mention),_this2.highlight(mention))}),$element.next().html(html),html},this.highlight=function(choice){return"<span>"+this.label(choice)+"</span>"},this.decode=function(){var value=arguments.length<=0||void 0===arguments[0]?ngModel.$modelValue:arguments[0];return value?value.replace(/@\[([\s\w]+):[0-9a-z-]+\]/gi,"$1"):""},this.label=function(choice){return choice.first+" "+choice.last},this.encode=function(choice){return"@["+this.label(choice)+":"+choice.id+"]"},this.replace=function(mention){var search=arguments.length<=1||void 0===arguments[1]?this.searching:arguments[1],text=arguments.length<=2||void 0===arguments[2]?ngModel.$viewValue:arguments[2];return text=text.substr(0,search.index+search[0].indexOf("@"))+this.label(mention)+" "+text.substr(search.index+search[0].length)},this.select=function(){var choice=arguments.length<=0||void 0===arguments[0]?this.activeChoice:arguments[0];this.searching&&(this.mentions.push(choice),ngModel.$setViewValue(this.replace(choice)),this.cancel(),ngModel.$render())},this.up=function(){var index=this.choices.indexOf(this.activeChoice);this.activeChoice=index>0?this.choices[index-1]:this.choices[this.choices.length-1]},this.down=function(){var index=this.choices.indexOf(this.activeChoice);this.activeChoice=index<this.choices.length-1?this.choices[index+1]:this.choices[0]},this.search=function(match){var _this3=this;return this.searching=match,$q.when(this.findChoices(match,this.mentions)).then(function(choices){return _this3.choices=choices,_this3.activeChoice=choices[0],choices})},this.findChoices=function(match,mentions){return[]},this.cancel=function(){this.choices=[],this.searching=null},this.autogrow=function(){$element[0].style.height=0;var style=getComputedStyle($element[0]);"border-box"==style.boxSizing&&($element[0].style.height=$element[0].scrollHeight+"px")},$element.on("keyup click focus",function(event){if(_this2.moved)return _this2.moved=!1;if($element[0].selectionStart==$element[0].selectionEnd){var text=$element.val(),match=_this2.pattern.exec(text.substr(0,$element[0].selectionStart));match?_this2.search(match):_this2.cancel(),$scope.$apply()}}),$element.on("keydown",function(event){if(_this2.searching){switch(event.keyCode){case 13:_this2.select();break;case 38:_this2.up();break;case 40:_this2.down();break;default:return}_this2.moved=!0,event.preventDefault(),$scope.$apply()}}),$element.on("input",this.autogrow),$timeout(this.autogrow,!0)}}});
\ No newline at end of file
+"use strict";var _slicedToArray=function(){function sliceIterator(arr,i){var _arr=[],_n=!0,_d=!1,_e=void 0;try{for(var _s,_i=arr[Symbol.iterator]();!(_n=(_s=_i.next()).done)&&(_arr.push(_s.value),!i||_arr.length!==i);_n=!0);}catch(err){_d=!0,_e=err}finally{try{!_n&&_i["return"]&&_i["return"]()}finally{if(_d)throw _e}}return _arr}return function(arr,i){if(Array.isArray(arr))return arr;if(Symbol.iterator in Object(arr))return sliceIterator(arr,i);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}();angular.module("ui.mention",[]).directive("uiMention",function($q,$timeout,$document){return{require:["ngModel","uiMention"],controllerAs:"$mention",link:function($scope,$element,$attrs,_ref){var _ref2=_slicedToArray(_ref,2),ngModel=_ref2[0],uiMention=_ref2[1];uiMention.init(ngModel)},controller:function($element,$scope,$attrs){var _this2=this;this.pattern=this.pattern||/(?:\s+|^)@(\w+(?: \w+)?)$/,this.$element=$element,this.choices=[],this.mentions=[];var ngModel;this.init=function(model){var _this=this;$attrs.ngTrim="false",ngModel=model,ngModel.$parsers.push(function(value){return _this.mentions=_this.mentions.filter(function(mention){return~value.indexOf(_this.label(mention))?value=value.replace(_this.label(mention),_this.encode(mention)):void 0}),_this.render(value),value}),ngModel.$formatters.push(function(){var value=arguments.length<=0||void 0===arguments[0]?"":arguments[0];return value=value.toString(),_this.mentions=_this.mentions.filter(function(mention){return~value.indexOf(_this.encode(mention))?(value=value.replace(_this.encode(mention),_this.label(mention)),!0):!1}),value}),ngModel.$render=function(){$element.val(ngModel.$viewValue||""),_this.render()}},this.render=function(){var html=arguments.length<=0||void 0===arguments[0]?ngModel.$modelValue:arguments[0];return html=(html||"").toString(),_this2.mentions.forEach(function(mention){html=html.replace(_this2.encode(mention),_this2.highlight(mention))}),$element.next().html(html),html},this.highlight=function(choice){return"<span>"+this.label(choice)+"</span>"},this.decode=function(){var value=arguments.length<=0||void 0===arguments[0]?ngModel.$modelValue:arguments[0];return value?value.replace(/@\[([\s\w]+):[0-9a-z-]+\]/gi,"$1"):""},this.label=function(choice){return choice.first+" "+choice.last},this.encode=function(choice){return"@["+this.label(choice)+":"+choice.id+"]"},this.replace=function(mention){var search=arguments.length<=1||void 0===arguments[1]?this.searching:arguments[1],text=arguments.length<=2||void 0===arguments[2]?ngModel.$viewValue:arguments[2];return text=text.substr(0,search.index+search[0].indexOf("@"))+this.label(mention)+" "+text.substr(search.index+search[0].length)},this.select=function(){var choice=arguments.length<=0||void 0===arguments[0]?this.activeChoice:arguments[0];this.mentions.push(choice),ngModel.$setViewValue(this.replace(choice)),this.cancel(),ngModel.$render()},this.up=function(){var index=this.choices.indexOf(this.activeChoice);this.activeChoice=index>0?this.choices[index-1]:this.choices[this.choices.length-1]},this.down=function(){var index=this.choices.indexOf(this.activeChoice);this.activeChoice=index<this.choices.length-1?this.choices[index+1]:this.choices[0]},this.search=function(match){var _this3=this;return this.searching=match,$q.when(this.findChoices(match,this.mentions)).then(function(choices){return _this3.choices=choices,_this3.activeChoice=choices[0],choices})},this.findChoices=function(match,mentions){return[]},this.cancel=function(){this.choices=[],this.searching=null},this.autogrow=function(){$element[0].style.height=0;var style=getComputedStyle($element[0]);"border-box"==style.boxSizing&&($element[0].style.height=$element[0].scrollHeight+"px")},$element.on("keyup click focus",function(event){if(_this2.moved)return _this2.moved=!1;if($element[0].selectionStart==$element[0].selectionEnd){var text=$element.val(),match=_this2.pattern.exec(text.substr(0,$element[0].selectionStart));match?_this2.search(match):_this2.cancel(),$scope.$apply()}}),$element.on("keydown",function(event){if(_this2.searching){switch(event.keyCode){case 13:_this2.select();break;case 38:_this2.up();break;case 40:_this2.down();break;default:return}_this2.moved=!0,event.preventDefault(),$scope.$apply()}}),this.onMouseup=function(event){var _this4=this;event.target!=$element[0]&&($document.off("mouseup",this.onMouseup),this.searching&&$scope.$evalAsync(function(){_this4.cancel()}))}.bind(this),$element.on("focus",function(event){$document.on("mouseup",_this2.onMouseup)}),$element.on("input",this.autogrow),$timeout(this.autogrow,!0)}}});
\ No newline at end of file
diff --git a/package.json b/package.json
index 9490633..daa8b45 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-mention",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Facebook-like @mentions for text inputs built around composability",
   "main": "src/mention.js",
   "scripts": {
diff --git a/src/mention.es6.js b/src/mention.es6.js
index 2030239..5a0d6f7 100644
--- a/src/mention.es6.js
+++ b/src/mention.es6.js
@@ -1,5 +1,5 @@
 angular.module('ui.mention', [])
-.directive('uiMention', function($q, $timeout){
+.directive('uiMention', function($q, $timeout, $document){
   return {
     require: ['ngModel', 'uiMention'],
     controllerAs: '$mention',
@@ -153,9 +153,6 @@ angular.module('ui.mention', [])
        * @param  {mixed|object} [choice] The selected choice (default: activeChoice)
        */
       this.select = function(choice = this.activeChoice) {
-        if (!this.searching)
-          return;
-
         // Add the mention
         this.mentions.push(choice);
 
@@ -291,6 +288,27 @@ angular.module('ui.mention', [])
         $scope.$apply();
       });
 
+
+
+      this.onMouseup = (function(event) {
+        if (event.target == $element[0])
+          return
+
+        $document.off('mouseup', this.onMouseup);
+
+        if (!this.searching)
+          return;
+
+        // Let ngClick fire first
+        $scope.$evalAsync( () => {
+          this.cancel();
+        });
+      }).bind(this);
+
+      $element.on('focus', event => {
+        $document.on('mouseup', this.onMouseup);
+      });
+
       // Autogrow is mandatory beacuse the textarea scrolls away from highlights
       $element.on('input', this.autogrow);
       // Initialize autogrow height