diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/en.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/en.json
index 0886572861..bb6999c100 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/en.json
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/en.json
@@ -1,6 +1,8 @@
 {
   "culture": "en",
   "texts": {
-    "Permissions": "Permissions"
+    "Permissions": "Permissions",
+    "OnlyProviderPermissons": "Only this provider",
+    "All": "All"
   }
 }
\ No newline at end of file
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/tr.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/tr.json
index 061b93fd86..8da6bccd95 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/tr.json
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/tr.json
@@ -1,6 +1,8 @@
 {
   "culture": "tr",
   "texts": {
-    "Permissions": "İzinler"
+    "Permissions": "İzinler",
+    "OnlyProviderPermissons": "Sadece bu sağlayıcı",
+    "All": "Hepsi"
   }
 }
\ No newline at end of file
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index a2bc020495..20b42df993 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -19,35 +19,49 @@
             <input asp-for="@Model.ProviderKey" />
             <input asp-for="@Model.ProviderName" />
 
-            <abp-row>
-                <abp-column size-sm="_4">
-                    <div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-                        @for (var i = 0; i < Model.Groups.Count; i++)
+            <abp-row h-align="End">
+                <div class="btn-group btn-group-toggle" data-toggle="buttons">
+                    <label class="btn btn-light btn-sm @(Model.ShowOnlyProviderPermissons? "":"active")">
+                       <input type="radio" value="0" name="ShowOnlyProviderPermissonsToggle" autocomplete="off"
+                               @(Model.ShowOnlyProviderPermissons ? "" : "checked") /> @L["All"]
+                     </label>
+                     <label class="btn btn-light btn-sm @(!Model.ShowOnlyProviderPermissons? "":"active")">
+                       <input type="radio" value="1" name="ShowOnlyProviderPermissonsToggle" autocomplete="off"
+                                   @(!Model.ShowOnlyProviderPermissons ? "" : "checked") />  @L["OnlyProviderPermissons"]
+                     </label>
+                </div>
+            </abp-row>
+
+            <abp-tabs tab-style="PillVertical" vertical-header-size="_4">
+                @for (var i = 0; i < Model.Groups.Count; i++)
+                {
+                    var hideTabOnToggle = true;
+                    @for (var j = 0; j < Model.Groups[i].Permissions.Count; j++)
+                    {
+                        if (!((Model.Groups[i].Permissions[j].Providers?.All(p => p.ProviderName != Model.ProviderName)) ?? true))
                         {
-                            <a class="nav-link @(i == 0 ? "active" : "")" id="v-pills-tab-@Model.Groups[i].GetNormalizedGroupName()" data-toggle="pill" href="#v-pills-@Model.Groups[i].GetNormalizedGroupName()" role="tab" aria-controls="v-pills-@Model.Groups[i].GetNormalizedGroupName()" aria-selected="false">@Model.Groups[i].DisplayName</a>
+                            hideTabOnToggle = false;
+                            break;
                         }
-                    </div>
-                </abp-column>
-                <abp-column size-sm="_8">
-                    <div class="tab-content" id="v-pills-tabContent">
-                        @for (var i = 0; i < Model.Groups.Count; i++)
+                    }
+
+                    <abp-tab header-class="@(hideTabOnToggle?"hideTabOnToggle":"")" title="@Model.Groups[i].DisplayName" name="v-pills-tab-@Model.Groups[i].GetNormalizedGroupName()">
+                        @for (var j = 0; j < Model.Groups[i].Permissions.Count; j++)
                         {
-                            <div class="tab-pane fade @(i == 0 ? "show active" : "")" id="v-pills-@Model.Groups[i].GetNormalizedGroupName()" role="tabpanel" aria-labelledby="v-pills-tab-@Model.Groups[i].GetNormalizedGroupName()">
-                                @for (var j = 0; j < Model.Groups[i].Permissions.Count; j++)
-                                {
-                                    <abp-input asp-for="@Model.Groups[i].Permissions[j].IsGranted" 
-                                               label="@Model.Groups[i].Permissions[j].GetShownName(Model.ProviderName)"
-                                               disabled="@Model.Groups[i].Permissions[j].IsDisabled(Model.ProviderName)"
-                                               group-data-permission-name="@Model.Groups[i].Permissions[j].Name"
-                                               group-data-parent-name="@(Model.Groups[i].Permissions[j].ParentName ?? "")"
-                                               group-style="margin-left: @(Model.Groups[i].Permissions[j].Depth * 20)px" />
-                                    <input asp-for="@Model.Groups[i].Permissions[j].Name" />
-                                }
+                            var hideCheckboxOnToggle = (Model.Groups[i].Permissions[j].Providers?.All(p => p.ProviderName != Model.ProviderName)) ?? true;
+                            <div class="@(hideCheckboxOnToggle?"HideOnProviderToggle":"")">
+                                <abp-input asp-for="@Model.Groups[i].Permissions[j].IsGranted"
+                                           label="@Model.Groups[i].Permissions[j].GetShownName(Model.ProviderName)"
+                                           disabled="@Model.Groups[i].Permissions[j].IsDisabled(Model.ProviderName)"
+                                           group-data-permission-name="@Model.Groups[i].Permissions[j].Name"
+                                           group-data-parent-name="@(Model.Groups[i].Permissions[j].ParentName ?? "")"
+                                           group-style="margin-left: @(Model.Groups[i].Permissions[j].Depth * 20)px" />
+                                <input asp-for="@Model.Groups[i].Permissions[j].Name" />
                             </div>
                         }
-                    </div>
-                </abp-column>
-            </abp-row>
+                    </abp-tab>
+                }
+            </abp-tabs>
 
         </abp-modal-body>
 
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
index 55217b797a..04ea5330db 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
@@ -20,6 +20,9 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
         [BindProperty(SupportsGet = true)]
         public string ProviderKey { get; set; }
 
+        [BindProperty(SupportsGet = true)]
+        public bool ShowOnlyProviderPermissons { get; set; } = false;
+
         [BindProperty]
         public List<PermissionGroupViewModel> Groups { get; set; }
 
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js
index fa4815e16e..c4256bfc26 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js
@@ -48,6 +48,17 @@
                         }
                     });
                 });
+                $('input:radio[name="ShowOnlyProviderPermissonsToggle"]').change(
+                    function () {
+                        if ($(this).val() == '1') {
+                            $('.HideOnProviderToggle').slideUp();
+                            $('.hideTabOnToggle').slideUp();
+                        }
+                        else {
+                            $('.HideOnProviderToggle').slideDown();
+                            $('.hideTabOnToggle').slideDown();
+                        }
+                    });
             });
         };
     };