diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index d0daacc9981..12f970e42fa 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -204,6 +204,8 @@ export default Ember.Controller.extend({
     return page === PAGE_LIMIT;
   },
 
+  searchButtonDisabled: Ember.computed.or("searching", "loading"),
+
   _search() {
     if (this.get("searching")) {
       return;
@@ -218,11 +220,12 @@ export default Ember.Controller.extend({
 
     let args = { q: searchTerm, page: this.get("page") };
 
-    this.set("searching", true);
-    this.set("loading", true);
     if (args.page === 1) {
       this.set("bulkSelectEnabled", false);
       this.get("selected").clear();
+      this.set("searching", true);
+    } else {
+      this.set("loading", true);
     }
 
     const sortOrder = this.get("sortOrder");