diff --git a/app/assets/javascripts/modal.js b/app/assets/javascripts/modal.js
index 3bc19e2d51..fa76d6e629 100644
--- a/app/assets/javascripts/modal.js
+++ b/app/assets/javascripts/modal.js
@@ -33,6 +33,13 @@ var ModalHelper = (function() {
         });
         // do not close when element is clicked
         modalDiv.click(function(e) {
+          jQuery(e.target).trigger('click.rails');
+
+          if (e.target.className.indexOf("watcher_link") > -1) {
+            e.preventDefault();
+          }
+
+
           e.stopPropagation();
         });
         ModalHelper.prototype.done = true;