diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 8b3c4cb0ba..f435937829 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -428,6 +428,7 @@ else {
 
 			//populate search/filter arrays
 			$array_categories[] = $row['default_setting_category'];
+			$array_categories_displayed[] = str_replace("_", " ", $row['default_setting_category']);
 			$array_setting_uuids[] = $row['default_setting_uuid'];
 			$array_setting_subcategories[] = $row['default_setting_subcategory'];
 			$array_setting_types[] = $row['default_setting_name'];
@@ -469,6 +470,7 @@ else {
 	//setting search script
 		echo "<script>\n";
 		echo "	var categories = new Array(\"".implode('","', $array_categories)."\");\n";
+		echo "	var categories_displayed = new Array(\"".implode('","', $array_categories_displayed)."\");\n";
 		echo "	var setting_uuids = new Array(\"".implode('","', $array_setting_uuids)."\");\n";
 		echo "	var setting_subcategories = new Array(\"".implode('","', $array_setting_subcategories)."\");\n";
 		echo "	var setting_types = new Array(\"".implode('","', $array_setting_types)."\");\n";
@@ -483,6 +485,7 @@ else {
 		echo "			}\n";
 		echo "			for (var x = 0; x < setting_uuids.length; x++) {\n";
 		echo "				if (\n";
+		echo "					categories_displayed[x].toLowerCase().match(criteria.toLowerCase()) ||\n";
 		echo "					setting_subcategories[x].toLowerCase().match(criteria.toLowerCase()) ||\n";
 		echo "					setting_types[x].toLowerCase().match(criteria.toLowerCase()) ||\n";
 		echo "					setting_values[x].toLowerCase().match(criteria.toLowerCase()) ||\n";
diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php
index 6c5fc913c2..b1f6d45e0e 100644
--- a/core/users/group_permissions.php
+++ b/core/users/group_permissions.php
@@ -398,6 +398,7 @@ require_once "resources/require.php";
 
 				//populate search/filter arrays
 				$array_apps[] = str_replace(' ','_',strtolower($app['name']));
+				$array_apps_original[] = $app['name'];
 				$array_permissions[] = $row['name'];
 				$array_descriptions[] = str_replace('"','\"',$row['description']);
 
@@ -435,6 +436,7 @@ require_once "resources/require.php";
 	echo "<script>\n";
 	echo "	var apps_unique = new Array(\"".implode('","', $array_apps_unique)."\");\n";
 	echo "	var apps = new Array(\"".implode('","', $array_apps)."\");\n";
+	echo "	var apps_original = new Array(\"".implode('","', $array_apps_original)."\");\n";
 	echo "	var permissions = new Array(\"".implode('","', $array_permissions)."\");\n";
 	echo "	var descriptions = new Array(\"".implode('","', $array_descriptions)."\");\n";
 	echo "\n";
@@ -446,6 +448,7 @@ require_once "resources/require.php";
 	echo "			}\n";
 	echo "			for (var x = 0; x < permissions.length; x++) {\n";
 	echo "				if (\n";
+	echo "					apps_original[x].toLowerCase().match(criteria.toLowerCase()) ||\n";
 	echo "					permissions[x].toLowerCase().match(criteria.toLowerCase()) ||\n";
 	echo "					descriptions[x].toLowerCase().match(criteria.toLowerCase())\n";
 	echo "					) {\n";