diff --git a/app/coffee/modules/issues/lightboxes.coffee b/app/coffee/modules/issues/lightboxes.coffee
index 859c9aa4..82a02198 100644
--- a/app/coffee/modules/issues/lightboxes.coffee
+++ b/app/coffee/modules/issues/lightboxes.coffee
@@ -124,7 +124,13 @@ module.directive("tgLbCreateIssue", [
 AddWatcherDirective = ->
     link = ($scope, $el, $attrs) ->
         $scope.usersSearch = {}
+        watchers = []
+
+        updateScopeFilteringUsers = () ->
+            $scope.filteredUsers = _.difference($scope.users, watchers)
+
         $scope.$on "watcher:add", ->
+            updateScopeFilteringUsers()
             $el.removeClass("hidden")
             $scope.$apply ->
                 $scope.usersSearch = {}
@@ -140,6 +146,7 @@ AddWatcherDirective = ->
             event.preventDefault()
             target = angular.element(event.currentTarget)
             watcher = target.scope().user
+            watchers.push watcher
             $el.addClass("hidden")
             $scope.$broadcast("watcher:added", watcher)
 
diff --git a/app/partials/views/modules/lightbox_users.jade b/app/partials/views/modules/lightbox_users.jade
index 11cc5a33..27258e30 100644
--- a/app/partials/views/modules/lightbox_users.jade
+++ b/app/partials/views/modules/lightbox_users.jade
@@ -6,7 +6,7 @@ form
         input(type="text", data-maxlength="500", placeholder="Search for users", ng-model="usersSearch.$")
 
     div.watchers
-        div.watcher-single(ng-repeat="user in users|filter:usersSearch:strict|limitTo:5 track by user.id")
+        div.watcher-single(ng-repeat="user in filteredUsers|filter:usersSearch:strict|limitTo:5 track by user.id")
             div.watcher-avatar
                 a.avatar(href="", title="Assigned to")
                     img(tg-bo-src="user.photo", tg-bo-alt="user.photo")