diff --git a/app/assets/javascripts/sitewide/tiny_mce.js b/app/assets/javascripts/sitewide/tiny_mce.js
index 35ee8d844..c4a845f17 100644
--- a/app/assets/javascripts/sitewide/tiny_mce.js
+++ b/app/assets/javascripts/sitewide/tiny_mce.js
@@ -193,6 +193,7 @@ var TinyMCE = (function() {
             editor.selection.collapse(false);
 
             SmartAnnotation.init($(editor.contentDocument.activeElement));
+            SmartAnnotation.preventPropagation('.atwho-user-popover');
             initHighlightjsIframe($(this.iframeElement).contents());
           },
           setup: function(editor) {