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 741e74a8978..70a5d5b94c3 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -231,6 +231,7 @@ export default Ember.Controller.extend({
         }
       }else{
         setTransient('lastSearch', { searchKey, model }, 5);
+        model.grouped_search_result = results.grouped_search_result;
         this.set("model", model);
       }
     }).finally(() => {
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 73598c948ef..3d981720ac4 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -36,7 +36,8 @@ export default Discourse.Route.extend({
         return null;
       }
     }).then(results => {
-      const model = (results && translateResults(results)) || {};
+      const grouped_search_result = results ? results.grouped_search_result : {};
+      const model = (results && translateResults(results)) || { grouped_search_result };
       setTransient('lastSearch', { searchKey, model }, 5);
       return model;
     });