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 0e0b2aa480..2d89ff866d 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
@@ -1,6 +1,4 @@
-@using Microsoft.Extensions.Localization
-@using Volo.Abp.PermissionManagement.Localization
-@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
+@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
 <Modal @ref="_modal" Closing="@ClosingModal">
     <ModalContent Size="ModalSize.Large" Centered="true">
         <ModalHeader>
@@ -8,74 +6,95 @@
             <CloseButton Clicked="CloseModal" />
         </ModalHeader>
         <ModalBody MaxHeight="50">
+
+            <Row Class="row d-flex align-items-center mb-2">
+                <Column>
+                    <Field Class="mb-2">
+                        <Addons>
+                            <Addon AddonType="AddonType.Start">
+                                <span class="input-group-text">
+                                   <Icon Name="IconName.Search"/>
+                                </span>
+                            </Addon>
+                            <Addon AddonType="AddonType.Body">
+                                <TextEdit Text="@_permissionGroupSearchText" TextChanged="OnPermissionGroupSearchTextChangedAsync"/>
+                            </Addon>
+                        </Addons>
+                    </Field>
+                </Column>
+                <Column ColumnSize="ColumnSize.IsAuto">
+                    <Field>
+                        <Check Disabled="_selectAllDisabled" Cursor="Cursor.Pointer" @bind-Checked="@GrantAll" TValue="bool">
+                            @L["SelectAllInAllTabs"]
+                        </Check>
+                    </Field>
+                </Column>
+            </Row>
             
-            <Field>
-                <Check Disabled="_selectAllDisabled" Cursor="Cursor.Pointer" @bind-Checked="@GrantAll" TValue="bool">
-                    @L["SelectAllInAllTabs"]
-                </Check>
-            </Field>
-            
-            <Divider />
-            
-            @if (_groups != null)
-            {
-                <Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@_selectedTabName">
-                    <Items>
-                        @foreach (var group in _groups)
-                        {
-                            <Tab Name="@GetNormalizedGroupName(group.Name)">
-                                @if (group.Permissions.Any(x => x.IsGranted))
+            <fieldset class="border rounded-4 p-3">
+                <legend class="px-1 h5 mb-0">@L["PermissionGroup"]</legend>
+                
+                    @if (_groups != null && _groups.Any())
+                    {
+                        <Tabs @key="_groups" TabPosition="TabPosition.Start" Pills="true" SelectedTab="@_selectedTabName" SelectedTabChanged="@OnSelectedTabChangedAsync">
+                            <Items>
+                                @foreach (var group in _groups)
                                 {
-                                    <span>
-                                        <b>@group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )</b>
-                                    </span>
+                                    <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>
                                 }
-                                else
+                            </Items>
+                            <Content>
+                                @foreach (var group in _groups)
                                 {
-                                    <span>
-                                        @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )
-                                    </span>
-                                }
-                            </Tab>
-                        }
-                    </Items>
-                    <Content>
-                        @foreach (var group in _groups)
-                        {
-                            <TabPanel Name="@GetNormalizedGroupName(group.Name)">
-                                
-                                <Field>
-                                    <Check
-                                        Disabled="@(IsPermissionGroupDisabled(group))"
-                                        Checked="@(group.Permissions.All(x => x.IsGranted))"
-                                        Cursor="Cursor.Pointer"
-                                        CheckedChanged="@(b => GroupGrantAllChanged(b, group))"
-                                        TValue="bool">
-                                        @L["SelectAllInThisTab"]
-                                    </Check>
-                                </Field>
+                                    <TabPanel Name="@GetNormalizedGroupName(group.Name)">
+                                        
+                                        <Field>
+                                            <Check
+                                                Disabled="@(IsPermissionGroupDisabled(group))"
+                                                Checked="@(group.Permissions.All(x => x.IsGranted))"
+                                                Cursor="Cursor.Pointer"
+                                                CheckedChanged="@(b => GroupGrantAllChanged(b, group))"
+                                                TValue="bool">
+                                                @L["SelectAllInThisTab"]
+                                            </Check>
+                                        </Field>
 
-                                <Divider />
-                                
-                                @foreach (var permission in group.Permissions)
-                                {
-                                    <Field Style="@($"margin-inline-start: {GetPermissionDepthOrDefault(permission.Name) * 20}px")">
-                                        <Check
-                                            Disabled="@(IsDisabledPermission(permission))"
-                                            Cursor="Cursor.Pointer"
-                                            Checked="@permission.IsGranted"
-                                            CheckedChanged="@(b => PermissionChanged(b, group, permission))"
-                                            TValue="bool">
-                                            @GetShownName(permission)
-                                        </Check>
-                                    </Field>
+                                        <Divider />
+                                        
+                                        @foreach (var permission in group.Permissions)
+                                        {
+                                            <Field Style="@($"margin-inline-start: {GetPermissionDepthOrDefault(permission.Name) * 20}px")">
+                                                <Check
+                                                    Disabled="@(IsDisabledPermission(permission))"
+                                                    Cursor="Cursor.Pointer"
+                                                    Checked="@permission.IsGranted"
+                                                    CheckedChanged="@(b => PermissionChanged(b, group, permission))"
+                                                    TValue="bool">
+                                                    @GetShownName(permission)
+                                                </Check>
+                                            </Field>
+                                        }
+                                        
+                                    </TabPanel>
                                 }
-                                
-                            </TabPanel>
-                        }
-                    </Content>
-                </Tabs>
-            }
+                            </Content>
+                        </Tabs>
+                    }
+                
+            </fieldset>
         </ModalBody>
         <ModalFooter>
             <Button Color="Color.Primary" Outline Clicked="CloseModal">@L["Cancel"]</Button>
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 65a2416bcc..a087a5cb8a 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
@@ -24,6 +24,7 @@ public partial class PermissionManagementModal
     protected string _providerKey;
 
     protected string _entityDisplayName;
+    protected List<PermissionGroupDto> _allGroups;
     protected List<PermissionGroupDto> _groups;
 
     protected List<PermissionGrantInfoDto> _disabledPermissions = new List<PermissionGrantInfoDto>();
@@ -34,6 +35,8 @@ public partial class PermissionManagementModal
     protected int _notGrantedPermissionCount = 0;
 
     protected bool _selectAllDisabled;
+    
+    protected string _permissionGroupSearchText;
 
     protected bool GrantAll {
         get {
@@ -85,35 +88,15 @@ public partial class PermissionManagementModal
         {
             _providerName = providerName;
             _providerKey = providerKey;
+            _permissionGroupSearchText = null;
 
             var result = await PermissionAppService.GetAsync(_providerName, _providerKey);
 
             _entityDisplayName = entityDisplayName ?? result.EntityDisplayName;
-            _groups = result.Groups;
+            _allGroups = result.Groups;
+            _groups = _allGroups;
 
-            _selectAllDisabled = _groups.All(IsPermissionGroupDisabled);
-
-            _grantedPermissionCount = 0;
-            _notGrantedPermissionCount = 0;
-            foreach (var permission in _groups.SelectMany(x => x.Permissions))
-            {
-                if (permission.IsGranted && permission.GrantedProviders.All(x => x.ProviderName != _providerName))
-                {
-                    _disabledPermissions.Add(permission);
-                    continue;
-                }
-
-                if (permission.IsGranted)
-                {
-                    _grantedPermissionCount++;
-                }
-                else
-                {
-                    _notGrantedPermissionCount++;
-                }
-            }
-
-            _selectedTabName = GetNormalizedGroupName(_groups.First().Name);
+            NormalizePermissionGroup();
 
             foreach (var group in _groups)
             {
@@ -127,6 +110,34 @@ public partial class PermissionManagementModal
             await HandleErrorAsync(ex);
         }
     }
+    
+    protected void NormalizePermissionGroup()
+    {
+        _selectAllDisabled = _groups.All(IsPermissionGroupDisabled);
+
+        _grantedPermissionCount = 0;
+        _notGrantedPermissionCount = 0;
+        _disabledPermissions.Clear();
+        foreach (var permission in _groups.SelectMany(x => x.Permissions))
+        {
+            if (permission.IsGranted && permission.GrantedProviders.All(x => x.ProviderName != _providerName))
+            {
+                _disabledPermissions.Add(permission);
+                continue;
+            }
+
+            if (permission.IsGranted)
+            {
+                _grantedPermissionCount++;
+            }
+            else
+            {
+                _notGrantedPermissionCount++;
+            }
+        }
+
+        _selectedTabName = GetNormalizedGroupName(_groups.First().Name);
+    }
 
     protected Task CloseModal()
     {
@@ -317,4 +328,26 @@ public partial class PermissionManagementModal
 
         return permissions.All(x => x.IsGranted) && grantedProviders.Any(p => p.ProviderName != _providerName);
     }
+    
+    protected virtual async Task OnPermissionGroupSearchTextChangedAsync(string value)
+    {
+        if (value == _permissionGroupSearchText)
+        {
+            return;
+        }
+        
+        _permissionGroupSearchText = value;
+        _groups = _permissionGroupSearchText.IsNullOrWhiteSpace() ? _allGroups : _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText, StringComparison.OrdinalIgnoreCase)).ToList();
+            
+        NormalizePermissionGroup();
+
+        await InvokeAsync(StateHasChanged);
+    }
+    
+    protected virtual Task OnSelectedTabChangedAsync(string name)
+    {
+        _selectedTabName = name;
+
+        return Task.CompletedTask;
+    }
 }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css
new file mode 100644
index 0000000000..6c827bec4a
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css
@@ -0,0 +1,31 @@
+fieldset legend {
+    float: none;
+    width: auto;
+}
+
+.lpx-scroll-pills-container ul {
+    display: block;
+    max-height: 500px;
+    overflow-y: auto;
+}
+
+.lpx-scroll-pills-container .tab-content {
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+}
+
+.lpx-scroll-pills-container ul li {
+    border: 1px solid #e8eef3;
+    margin-bottom: 10px;
+    border-radius: 10px;
+}
+
+.lpx-scroll-pills-container ul li a.active {
+    color: #fff !important;
+    border-color: #6c5dd3 !important;
+    background-color: #6c5dd3 !important;
+}
+
+.lpx-theme-dark .lpx-scroll-pills-container ul li {
+    border: 1px solid #23262a;
+}
\ No newline at end of file