diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs
index 81c4733582..c5a4970e79 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.FeatureManagement.Blazor;
 using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement.Blazor.Navigation;
 using Volo.Abp.UI.Navigation;
@@ -9,7 +10,8 @@ namespace Volo.Abp.TenantManagement.Blazor
 {
     [DependsOn(
         typeof(AbpAutoMapperModule),
-        typeof(AbpTenantManagementHttpApiClientModule)
+        typeof(AbpTenantManagementHttpApiClientModule),
+        typeof(AbpFeatureManagementBlazorModule)
     )]
     public class AbpTenantManagementBlazorModule : AbpModule
     {
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index 6b3320eb9f..0b2f60d23b 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -3,6 +3,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.TenantManagement.Localization
+@using Volo.Abp.FeatureManagement.Blazor.Components
 @inherits TenantManagementBase
 @inject IStringLocalizer<AbpTenantManagementResource> L
 
@@ -48,7 +49,7 @@
                             }
                             @if (HasManageFeaturesPermission)
                             {
-                                <DropdownItem Clicked="() => OpenEditConnectionStringModalAsync(context.As<TenantDto>().Id)">@L["Features"]</DropdownItem>
+                                <DropdownItem Clicked="() => FeatureManagementModal.OpenAsync(FeatureProviderName, context.As<TenantDto>().Id.ToString())">@L["Features"]</DropdownItem>
                             }
                             @if (HasDeletePermission)
                             {
@@ -159,4 +160,9 @@
             </ModalFooter>
         </ModalContent>
     </Modal>
+}
+
+@if (HasManageFeaturesPermission)
+{
+    <FeatureManagementModal @ref="FeatureManagementModal"/>
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index 5db7bc35ad..f9dd57422e 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -3,16 +3,21 @@ using System.Threading.Tasks;
 using Blazorise;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.BlazoriseUI;
+using Volo.Abp.FeatureManagement.Blazor.Components;
 
 namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 {
     public abstract class TenantManagementBase 
         : AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
     {
+        protected const string FeatureProviderName = "T";
+        
         protected bool ShouldShowEntityActions;
         protected bool HasManageConnectionStringsPermission;
         protected bool HasManageFeaturesPermission;
 
+        protected FeatureManagementModal FeatureManagementModal;
+        
         protected Modal ManageConnectionStringModal;
 
         protected TenantInfoModel TenantInfo;
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj
index 38bbaf39a2..31e37e02a7 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj
@@ -13,6 +13,10 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Blazor\Volo.Abp.FeatureManagement.Blazor.csproj" />
+  </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.TenantManagement.HttpApi.Client\Volo.Abp.TenantManagement.HttpApi.Client.csproj" />
   </ItemGroup>