diff --git a/app/modules/components/assigned/assigned-users-inline.directive.coffee b/app/modules/components/assigned/assigned-users-inline.directive.coffee
index d4a42c10..7aad89fa 100644
--- a/app/modules/components/assigned/assigned-users-inline.directive.coffee
+++ b/app/modules/components/assigned/assigned-users-inline.directive.coffee
@@ -73,20 +73,24 @@ $translate, $compile, $currentUserService, avatarService, $userListService) ->
         $el.on "click", ".users-dropdown", (event) ->
             event.preventDefault()
             event.stopPropagation()
-            $scope.usersSearch = ""
+            $scope.usersSearch = null
             renderUsersList()
             $scope.$apply()
             $el.find(".pop-users").popover().open()
 
+        $scope.assign = (user) ->
+            currentAssignedIds.push(user.id)
+            renderUsers()
+            applyToModel()
+
         $scope.selfAssign = () ->
             currentAssignedIds.push($currentUserService.getUser().get('id'))
             renderUsers()
             applyToModel()
-            $scope.usersSearch = null
 
         $scope.unassign = (user) ->
-            userIndex = currentAssignedIds.indexOf(user.id)
-            currentAssignedIds.splice(userIndex, 1)
+            index = currentAssignedIds.indexOf(user.id)
+            currentAssignedIds.splice(index, 1)
             renderUsers()
             applyToModel()
 
@@ -98,21 +102,6 @@ $translate, $compile, $currentUserService, avatarService, $userListService) ->
                 renderUsersList(searchingText)
                 $el.find('input').focus()
 
-        $el.on "click", ".user-list-single", (event) ->
-            event.preventDefault()
-            event.stopPropagation()
-            target = angular.element(event.currentTarget)
-            index = currentAssignedIds.indexOf(target.data("user-id"))
-            if index == -1
-                currentAssignedIds.push(target.data("user-id"))
-            else
-                currentAssignedIds.splice(index, 1)
-            applyToModel()
-            renderUsers()
-            $el.find(".pop-users").popover().close()
-            $scope.usersSearch = null
-            $scope.$apply()
-
         $scope.$watch $attrs.ngModel, (item) ->
             return if not item?
             currentAssignedIds = []
diff --git a/app/partials/common/components/assigned-users-inline.jade b/app/partials/common/components/assigned-users-inline.jade
index a730d833..1224012c 100644
--- a/app/partials/common/components/assigned-users-inline.jade
+++ b/app/partials/common/components/assigned-users-inline.jade
@@ -95,6 +95,7 @@ div.pop-users.popover(ng-class="{'multiple': assignedUsers.length > 0}")
         data-user-id="{{ user.id }}"
         title="{{ user.full_name_display }}"
         ng-repeat="user in users"
+        ng-click="assign(user)"
     )
         img.user-list-avatar(
             style="background: {{user.avatar.bg }}"