diff --git a/app/assets/javascripts/sitewide/atwho_res.js b/app/assets/javascripts/sitewide/atwho_res.js
index fe8cb300a..c200a3169 100644
--- a/app/assets/javascripts/sitewide/atwho_res.js
+++ b/app/assets/javascripts/sitewide/atwho_res.js
@@ -57,10 +57,11 @@ var SmartAnnotation = (function() {
         callbacks: {
           remoteFilter: function(query, callback) {
 
-            // show loader after .25 seconds
+            // show loader after .25 seconds and block other tab clicks
             var loaderTimeout = setTimeout(function() {
               $('.atwho-scroll-container').css({ height: '100px' });
               $('.atwho-scroll-container').html('<div class="loading-overlay" style="padding: 20px"></div>');
+              $('.atwho-header-res').css({ 'pointer-events': 'none' });
             }, 250);
 
             var $currentAtWho = $(`.atwho-view[data-at-who-id=${$(field).attr('data-smart-annotation')}]`);
@@ -69,6 +70,8 @@ var SmartAnnotation = (function() {
             filterType = FilterTypeEnum[$currentAtWho.find('.tab-pane.active').data('object-type')];
             if (!filterType) {
               clearTimeout(loaderTimeout);
+              $('.atwho-header-res').css({ 'pointer-events': '' });
+
               callback([{ name: '' }]);
               return false;
             }
@@ -82,6 +85,7 @@ var SmartAnnotation = (function() {
             }
             $.getJSON(filterType.dataUrl, params, function(data) {
               clearTimeout(loaderTimeout);
+              $('.atwho-header-res').css({ 'pointer-events': '' });
 
               localStorage.setItem('smart_annotation_states/teams/' + data.team, JSON.stringify({
                 tag: filterType.tag,