diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
index 2786318c36..a2c31ca377 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
@@ -3,25 +3,71 @@
 @inject IStringLocalizer<AbpPermissionManagementResource> L
 <Modal @ref="_modal">
     <ModalBackdrop />
-    <ModalContent IsCentered="true">
+    <ModalContent Size="ModalSize.Large" IsCentered="true">
         <ModalHeader>
-            <ModalTitle>Edit role</ModalTitle>
+            <ModalTitle>@L["Permissions"] - @_providerKey</ModalTitle>
             <CloseButton Clicked="CloseModal" />
         </ModalHeader>
         <ModalBody MaxHeight="50">
+            
+            <Field>
+                <Check Cursor="Cursor.Pointer" Checked="@GrantAll" CheckedChanged="GrantAllChanged" TValue="bool">@L["SelectAllInAllTabs"]</Check>
+            </Field>
+            
+            <Divider />
+            
             @if (_groups != null)
             {
-                @foreach (var group in _groups)
-                {
-                    <h3>@group.DisplayName</h3>
+                <Tabs TabPosition="TabPosition.Left" Pills="true" SelectedTab="@GetNormalizedGroupName(_groups.First().Name)">
+                    <Items>
+                        @foreach (var group in _groups)
+                        {
+                            <Tab Name="@GetNormalizedGroupName(group.Name)">
+                                @if (group.Permissions.Any(x => x.IsGranted))
+                                {
+                                    <span>
+                                        <b>@group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )</b>
+                                    </span>
+                                }
+                                else
+                                {
+                                    <span>
+                                        @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )
+                                    </span>
+                                }
+                            </Tab>
+                        }
+                    </Items>
+                    <Content>
+                        @foreach (var group in _groups)
+                        {
+                            <TabPanel Name="@GetNormalizedGroupName(group.Name)">
+                                <h4>@group.DisplayName</h4>
+                                
+                                @{
+                                    /* TODO: add Select All In This Tab 
+                                <Divider />
+                                
+                                <Field>
+                                    <Check Cursor="Cursor.Pointer" TValue="bool">@L["SelectAllInThisTab"]</Check>
+                                </Field>
 
-                    @foreach (var permission in group.Permissions)
-                    {
-                        <Field Margin="permission.ParentName != null ? Blazorise.Margin.Is3.OnAll : Blazorise.Margin.Is0.OnAll">
-                            <Check @bind-checked="@permission.IsGranted" TValue="bool">@permission.DisplayName</Check>
-                        </Field>
-                    }
-                }
+                                <Divider />
+                                     */
+                                }
+                                
+                                
+                                @foreach (var permission in group.Permissions)
+                                {
+                                    <Field Margin="permission.ParentName != null ? Blazorise.Margin.Is3.OnAll : Blazorise.Margin.Is0.OnAll">
+                                        <Check Cursor="Cursor.Pointer" @bind-checked="@permission.IsGranted" TValue="bool">@permission.DisplayName</Check>
+                                    </Field>
+                                }
+                                
+                            </TabPanel>
+                        }
+                    </Content>
+                </Tabs>
             }
         </ModalBody>
         <ModalFooter>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
index 7250c177d7..d4999c63f4 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
@@ -18,6 +18,29 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
         private string _entityDisplayName;
         private List<PermissionGroupDto> _groups;
 
+        private bool GrantAll
+        {
+            get
+            {
+                return _groups != null && _groups.All(x => x.Permissions.All(y => y.IsGranted));
+            }
+            set
+            {
+                if (_groups == null)
+                {
+                    return;
+                }
+                
+                foreach (var permissionGroupDto in _groups)
+                {
+                    foreach (var permission in permissionGroupDto.Permissions)
+                    {
+                        permission.IsGranted = value;
+                    }
+                }
+            }
+        }
+        
         public async Task OpenAsync(string providerName, string providerKey)
         {
             _providerName = providerName;
@@ -55,5 +78,10 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
         {
             return "PermissionGroup_" + name.Replace(".", "_");
         }
+
+        public void GrantAllChanged(bool value)
+        {
+            GrantAll = value;
+        }
     }
 }