diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
index 58d95c9a8b..c76807bd90 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
@@ -32,6 +32,7 @@
                 class="nav-link pointer"
                 [class.active]="selectedGroup?.name === group?.name"
                 (click)="onChangeGroup(group)"
+                (select)="setDisabled(group.permissions)"
               >
                 <div [class.font-weight-bold]="count.assignedCount">
                   {{ group?.displayName }}
diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
index 1b8649edd6..5de0311fcb 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
@@ -138,11 +138,18 @@ export class PermissionManagementComponent
   }
 
   setDisabled(grantedProviders) {
-    this.disableSelectAllTab = grantedProviders.some(p => p.providerName !== this.providerName);
+    if (grantedProviders.length) {
+      grantedProviders.forEach(permission => {
+        this.disableSelectAllTab = permission.grantedProviders?.some(
+          p => p.providerName !== this.providerName,
+        );
+      });
+    } else {
+      this.disableSelectAllTab = false;
+    }
   }
 
   isGrantedByOtherProviderName(grantedProviders: ProviderInfoDto[]): boolean {
-    this.setDisabled(grantedProviders);
     if (grantedProviders.length) {
       return grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1;
     }
@@ -239,6 +246,7 @@ export class PermissionManagementComponent
   }
 
   onChangeGroup(group: PermissionGroupDto) {
+    this.setDisabled(group.permissions);
     this.selectedGroup = group;
     this.setTabCheckboxState();
   }
@@ -291,6 +299,7 @@ export class PermissionManagementComponent
   initModal() {
     // TODO: Refactor
     setTimeout(() => {
+      this.setDisabled(this.data.groups[0]?.permissions);
       this.setTabCheckboxState();
       this.setGrantCheckboxState();
     });