diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index a6363c1eb..74be82496 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -811,6 +811,17 @@ class AdminModulesControllerCore extends AdminController
 			return true;
 
 
+		// Filter on module name
+		$filter_name = Tools::getValue('filtername');
+		if (!empty($filter_name))
+		{
+			if (stristr($module->name, $filter_name) === false && stristr($module->displayName, $filter_name) === false && stristr($module->description, $filter_name) === false)
+				return true;
+			else
+				return false;
+		}
+
+
 		// Filter on module category
 		$categoryFiltered = array();
 		$filterCategories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee));
@@ -862,12 +873,6 @@ class AdminModulesControllerCore extends AdminController
 			return true;
 
 
-		// Filter on module name
-		$filter_name = Tools::getValue('filtername');
-		if (!empty($filter_name) AND (stristr($module->name, $filter_name) === false AND stristr($module->displayName, $filter_name) === false AND stristr($module->description, $filter_name) === false))
-			return true;
-
-
 		// Module has not been filtered		
 		return false;
 	}