diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 0b6f250..16063d1 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -429,8 +429,9 @@ class IssuesController < ApplicationController
     @priorities = IssuePriority.active
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
     @available_watchers = @issue.watcher_users
-    if @issue.project.users.count <= 20
-      @available_watchers = (@available_watchers + @issue.project.users.sort).uniq
+    available_watchers_in_project = @issue.project.users.select{|user| @issue.visible?(user)}
+    if available_watchers_in_project.count <= 20
+      @available_watchers = (@available_watchers + available_watchers_in_project.sort).uniq
     end
   end