diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index ad14dd5344..69b5ee9b02 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -235,11 +235,15 @@ function SmartSearchController (
     };
 
     $scope.clearAllTerms = () => {
-        const cleared = _(defaults).omit(_.isNull).value();
+        const cleared = {};
 
-        delete cleared.page;
+        _.forOwn(defaults, function(value, key) {
+            if (key !== "page") {
+                cleared[key] = _.has(queryset, key) ? queryset[key] : value;
+            }
+        });
 
-        queryset = cleared;
+        queryset = _(cleared).omit(_.isNull).value();
 
         if (!$scope.querySet) {
             $state.go('.', { [searchKey]: queryset });