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 86326b5984..62fc5f8e4a 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
@@ -26,7 +26,7 @@
               <li *ngFor="let group of groups$ | async; trackBy: trackByFn" class="nav-item">
                 <a
                   class="nav-link pointer"
-                  [class.active]="selectedGroup.name === group.name"
+                  [class.active]="selectedGroup?.name === group?.name"
                   (click)="onChangeGroup(group)"
                   >{{ group?.displayName }}</a
                 >
@@ -65,7 +65,7 @@
                   [value]="getChecked(permission.name)"
                   [attr.id]="permission.name"
                   class="custom-control-input"
-                  [disabled]="permission.isGranted && permission.grantedProviders.length > 0"
+                  [disabled]="isGrantedByRole(permission.grantedProviders)"
                 />
                 <label
                   class="custom-control-label"
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 7843958ae3..ed1ee61cd9 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
@@ -94,8 +94,15 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
     return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted;
   }
 
+  isGrantedByRole(grantedProviders: PermissionManagement.GrantedProvider[]): boolean {
+    if (grantedProviders.length) {
+      return grantedProviders.findIndex(p => p.providerName === 'Role') === -1 ? false : true;
+    }
+    return false;
+  }
+
   onClickCheckbox(clickedPermission: PermissionManagement.Permission, value) {
-    if (clickedPermission.isGranted && clickedPermission.grantedProviders.length > 0) return;
+    if (clickedPermission.isGranted && this.isGrantedByRole(clickedPermission.grantedProviders)) return;
 
     setTimeout(() => {
       this.permissions = this.permissions.map(per => {
@@ -150,7 +157,7 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
   onClickSelectThisTab() {
     this.selectedGroupPermissions$.pipe(take(1)).subscribe(permissions => {
       permissions.forEach(permission => {
-        if (permission.isGranted && permission.grantedProviders.length > 0) return;
+        if (permission.isGranted && this.isGrantedByRole(permission.grantedProviders)) return;
 
         const index = this.permissions.findIndex(per => per.name === permission.name);