diff --git a/public/controllers/management/groups.js b/public/controllers/management/groups.js
index a8cdde857..a452666de 100644
--- a/public/controllers/management/groups.js
+++ b/public/controllers/management/groups.js
@@ -566,4 +566,11 @@ export function GroupsController(
     }
     $scope.$broadcast('wazuhSearch', {});
   };
+
+  // Come from the pencil icon on the groups table
+  $scope.$on('openGroupFromList',(ev,parameters) => {
+    $scope.editingFile = true;
+    $scope.groupsSelectedTab = 'files';
+    return $scope.loadGroup(parameters.group).then(() => $scope.editGroupAgentConfig());
+  })
 }
diff --git a/public/directives/wz-table/wz-table-directive.js b/public/directives/wz-table/wz-table-directive.js
index 6c00750e9..bc6c6520c 100644
--- a/public/directives/wz-table/wz-table-directive.js
+++ b/public/directives/wz-table/wz-table-directive.js
@@ -332,6 +332,10 @@ app.directive('wzTable', function () {
         $scope.removingGroup = null;
         return init();
       };
+
+      $scope.editGroup = group => {
+        $scope.$emit('openGroupFromList',{group})
+      }
     },
     template
   };
diff --git a/public/directives/wz-table/wz-table.html b/public/directives/wz-table/wz-table.html
index d8f9f4f18..d549baf0f 100644
--- a/public/directives/wz-table/wz-table.html
+++ b/public/directives/wz-table/wz-table.html
@@ -39,7 +39,9 @@
                     <i ng-if="removingGroup !== item.name && item.name !== 'default'" ng-click="showConfirmRemoveGroup($event, item); $event.stopPropagation()"
                         class="fa fa-fw fa-trash cursor-pointer" tooltip="Remove this group" tooltip-placement="left"
                         aria-hidden="true"></i>
-                        <span class="wz-padding-left-8" ng-if="removingGroup !== item.name && item.name === 'default'">-</span>
+                    <i ng-if="removingGroup !== item.name" ng-click="editGroup(item); $event.stopPropagation()"
+                        class="fa fa-fw fa-pencil cursor-pointer" tooltip="Edit this group configuration" tooltip-placement="left"
+                        aria-hidden="true"></i>
                     <div ng-if="removingGroup === item.name && item.name !== 'default'">
                         <div layout="row">
                             <span class="euiToastHeader__title font-size-12">Group {{item.name}} will be removed</span>