diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 172bd9e4b1a..d07fe5cdc24 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -334,7 +334,10 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   },
 
   stopLoading() {
-    this.focus();
+    if (this.site && !this.site.isMobileDevice) {
+      this.focusFilterOrHeader();
+    }
+
     this.set("isLoading", false);
     this._boundaryActionHandler("onStopLoading");
   },
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js.es6
index 1c2e10f6f43..e1c2d0e0d9b 100644
--- a/app/assets/javascripts/select-kit/mixins/tags.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/tags.js.es6
@@ -28,7 +28,6 @@ export default Ember.Mixin.create({
     })
     .finally(() => {
       self.stopLoading();
-      self.focusFilterOrHeader();
     });
   },