diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 2a85b040c6..355024dcdb 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -289,7 +289,7 @@ $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
 $selected = 'border: 1px solid black;';
 
-$order[] = array('field' => 'id_module_group', 'order' => 'ASC');
+$order[] = array('field' => 'tmodule_group.name', 'order' => 'ASC');
 
 switch ($sortField) {
 	case 'name':
@@ -452,7 +452,9 @@ switch ($config["dbtype"]) {
 		}
 		$sql = sprintf("SELECT %s
 			FROM tagente_modulo
-			WHERE %s %s %s %s %s", 
+			LEFT JOIN tmodule_group
+			ON tagente_modulo.id_module_group = tmodule_group.id_mg
+			WHERE %s %s %s %s %s",
 			$params, $basic_where, $where, $where_tags, $order_sql, $limit_sql);
 		
 		$modules = db_get_all_rows_sql($sql);
@@ -465,7 +467,9 @@ switch ($config["dbtype"]) {
 		}
 		$sql = sprintf("SELECT %s
 			FROM tagente_modulo
-			WHERE %s %s %s %s", 
+			LEFT JOIN tmodule_group
+			ON tmodule_group.id_mg = tagente_modulo.id_module_group
+			WHERE %s %s %s %s",
 			$params, $basic_where, $where, $where_tags, $order_sql);
 		$modules = oracle_recode_query ($sql, $set, 'AND', false);
 		break;
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 87d313ef0c..01941a3250 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -618,7 +618,7 @@ if ($list_modules) {
 					AND %s %s
 					AND tagente_estado.estado != %d
 					AND tagente_modulo.%s
-				ORDER BY tagente_modulo.id_module_group , %s  %s",
+				ORDER BY tmodule_group.name , %s  %s",
 				$id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql, $tags_sql, AGENT_MODULE_STATUS_NO_DATA,
 				$status_module_group_filter, $order['field'], $order['order']);
 
@@ -637,7 +637,7 @@ if ($list_modules) {
 					AND %s %s
 					AND tagente_estado.estado != %d
 					AND tagente_modulo.%s
-				ORDER BY tagente_modulo.id_module_group , %s  %s",
+				ORDER BY tmodule_group.name , %s  %s",
 				$id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql, $tags_sql, AGENT_MODULE_STATUS_NO_DATA,
 				$status_module_group_filter, $order['field'], $order['order']);
 			break;
@@ -660,7 +660,7 @@ if ($list_modules) {
 					AND tagente_modulo.disabled = 0
 					AND tagente_estado.estado != %d
 					AND tagente_modulo.%s
-				ORDER BY tagente_modulo.id_module_group , %s %s
+				ORDER BY tmodule_group.name , %s %s
 				", $id_agente, $status_text_monitor_sql, $tags_sql, $status_filter_sql, AGENT_MODULE_STATUS_NO_DATA,
 				 $status_module_group_filter, $order['field'], $order['order']);
 			break;