diff --git a/platform/search/src/controllers/SearchMenuController.js b/platform/search/src/controllers/SearchMenuController.js
index ae53338795..f6018b732c 100644
--- a/platform/search/src/controllers/SearchMenuController.js
+++ b/platform/search/src/controllers/SearchMenuController.js
@@ -80,7 +80,7 @@ define(function () {
                 // If there's still nothing in the filters string, there are no
                 //   filters selected
                 if ($scope.ngModel.filtersString === '') {
-                    $scope.ngModel.filtersString = 'NONE';
+                    $scope.ngModel.checkAll = true;
                 }
             }
 
@@ -95,12 +95,11 @@ define(function () {
                 $scope.ngModel.checked[type] = false;
             });
 
-            // Change the filters string depending on checkAll status
-            if ($scope.ngModel.checkAll) {
-                // This setting will make the filters display hidden
-                $scope.ngModel.filtersString = '';
-            } else {
-                $scope.ngModel.filtersString = 'NONE';
+            // This setting will make the filters display hidden
+            $scope.ngModel.filtersString = '';
+            // Do not let checkAll become unchecked when it is the only checked filter
+            if (!$scope.ngModel.checkAll) {
+                $scope.ngModel.checkAll = true;
             }
 
             // Re-filter results