diff --git a/src/Server.UI/Components/Autocompletes/LanguageAutocomplete.cs b/src/Server.UI/Components/Autocompletes/LanguageAutocomplete.cs
index 4126ffdce..6504322f3 100644
--- a/src/Server.UI/Components/Autocompletes/LanguageAutocomplete.cs
+++ b/src/Server.UI/Components/Autocompletes/LanguageAutocomplete.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.Blazor.Server.UI.Components.Autocompletes;
 
-public class LanguageAutocomplete : MudAutocomplete<string>
+public class LanguageAutocomplete<T> : MudAutocomplete<string>
 {
     public LanguageAutocomplete()
     {
diff --git a/src/Server.UI/Components/Autocompletes/MultiTenantAutocomplete.razor.cs b/src/Server.UI/Components/Autocompletes/MultiTenantAutocomplete.razor.cs
index a302568f1..4ba0cf5bc 100644
--- a/src/Server.UI/Components/Autocompletes/MultiTenantAutocomplete.razor.cs
+++ b/src/Server.UI/Components/Autocompletes/MultiTenantAutocomplete.razor.cs
@@ -3,7 +3,7 @@
 
 namespace CleanArchitecture.Blazor.Server.UI.Components.Autocompletes;
 
-public class MultiTenantAutocomplete : MudAutocomplete<TenantDto>
+public class MultiTenantAutocomplete<T> : MudAutocomplete<TenantDto>
 {
     public MultiTenantAutocomplete()
     {
diff --git a/src/Server.UI/Components/Autocompletes/PickSuperiorIdAutocomplete.razor.cs b/src/Server.UI/Components/Autocompletes/PickSuperiorIdAutocomplete.razor.cs
index 4950f02ec..95b6d7628 100644
--- a/src/Server.UI/Components/Autocompletes/PickSuperiorIdAutocomplete.razor.cs
+++ b/src/Server.UI/Components/Autocompletes/PickSuperiorIdAutocomplete.razor.cs
@@ -3,7 +3,7 @@
 
 namespace CleanArchitecture.Blazor.Server.UI.Components.Autocompletes;
 
-public class PickSuperiorIdAutocomplete : MudAutocomplete<ApplicationUserDto>
+public class PickSuperiorIdAutocomplete<T> : MudAutocomplete<ApplicationUserDto>
 {
     public PickSuperiorIdAutocomplete()
     {
diff --git a/src/Server.UI/Components/Autocompletes/PickUserAutocomplete.razor.cs b/src/Server.UI/Components/Autocompletes/PickUserAutocomplete.razor.cs
index 4b331fe93..0ba5ca5e7 100644
--- a/src/Server.UI/Components/Autocompletes/PickUserAutocomplete.razor.cs
+++ b/src/Server.UI/Components/Autocompletes/PickUserAutocomplete.razor.cs
@@ -3,7 +3,7 @@
 
 namespace CleanArchitecture.Blazor.Server.UI.Components.Autocompletes;
 
-public class PickUserAutocomplete : MudAutocomplete<ApplicationUserDto>
+public class PickUserAutocomplete<T> : MudAutocomplete<ApplicationUserDto>
 {
     public PickUserAutocomplete()
     {
diff --git a/src/Server.UI/Components/Autocompletes/PicklistAutocomplete.razor.cs b/src/Server.UI/Components/Autocompletes/PicklistAutocomplete.razor.cs
index 0733ef716..b8ddff3c6 100644
--- a/src/Server.UI/Components/Autocompletes/PicklistAutocomplete.razor.cs
+++ b/src/Server.UI/Components/Autocompletes/PicklistAutocomplete.razor.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.Blazor.Server.UI.Components.Autocompletes;
 
-public class PicklistAutocomplete : MudAutocomplete<string>
+public class PicklistAutocomplete<T> : MudAutocomplete<string>
 {
     public PicklistAutocomplete()
     {
diff --git a/src/Server.UI/Components/Autocompletes/TimeZoneAutocomplete.cs b/src/Server.UI/Components/Autocompletes/TimeZoneAutocomplete.cs
index e3a7c8f59..5ffa53b57 100644
--- a/src/Server.UI/Components/Autocompletes/TimeZoneAutocomplete.cs
+++ b/src/Server.UI/Components/Autocompletes/TimeZoneAutocomplete.cs
@@ -1,6 +1,6 @@
 namespace CleanArchitecture.Blazor.Server.UI.Components.Autocompletes;
 
-public class TimeZoneAutocomplete : MudAutocomplete<string>
+public class TimeZoneAutocomplete<T> : MudAutocomplete<string>
 {
     public TimeZoneAutocomplete()
     {
diff --git a/src/Server.UI/Components/Shared/Layout/AppLayout.razor b/src/Server.UI/Components/Shared/Layout/AppLayout.razor
index a21b96722..79f8a3e24 100644
--- a/src/Server.UI/Components/Shared/Layout/AppLayout.razor
+++ b/src/Server.UI/Components/Shared/Layout/AppLayout.razor
@@ -108,7 +108,7 @@
                 FullWidth = true
             };
 
-            var commandPalette = DialogService.Show<SearchDialog>("", options);
+            var commandPalette =await DialogService.ShowAsync<SearchDialog>("", options);
             _commandPaletteOpen = true;
 
             await commandPalette.Result;
diff --git a/src/Server.UI/Pages/Documents/Documents.razor b/src/Server.UI/Pages/Documents/Documents.razor
index eb0eac7cc..5e3ef49f4 100644
--- a/src/Server.UI/Pages/Documents/Documents.razor
+++ b/src/Server.UI/Pages/Documents/Documents.razor
@@ -323,7 +323,7 @@
             { x => x.Model, command }
         };
         var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = DialogService.Show<UploadFilesFormDialog>
+        var dialog = await DialogService.ShowAsync<UploadFilesFormDialog>
             (L["Upload Pictures"], parameters, options);
         var state = await dialog.Result;
         if (state is not null && !state.Canceled)
@@ -341,7 +341,7 @@
             { nameof(DocumentFormDialog.Model), command }
         };
         var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Medium, FullWidth = true };
-        var dialog = DialogService.Show<DocumentFormDialog>(string.Format(ConstantString.EditTheItem, L["Document"]), parameters, options);
+        var dialog = await DialogService.ShowAsync<DocumentFormDialog>(string.Format(ConstantString.EditTheItem, L["Document"]), parameters, options);
 
 
         var state = await dialog.Result;
diff --git a/src/Server.UI/Pages/Identity/Roles/Roles.razor b/src/Server.UI/Pages/Identity/Roles/Roles.razor
index 669f348e7..893a3246c 100644
--- a/src/Server.UI/Pages/Identity/Roles/Roles.razor
+++ b/src/Server.UI/Pages/Identity/Roles/Roles.razor
@@ -280,7 +280,7 @@
     {
         var parameters = new DialogParameters<RoleFormDialog> { { x => x.Model, model } };
         var options = new DialogOptions { CloseButton = true, CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = DialogService.Show<RoleFormDialog>(title, parameters, options);
+        var dialog = await DialogService.ShowAsync<RoleFormDialog>(title, parameters, options);
         var result = await dialog.Result;
 
         if (result is not null && !result.Canceled)
diff --git a/src/Server.UI/Pages/Identity/Users/Users.razor b/src/Server.UI/Pages/Identity/Users/Users.razor
index 1ab8f5a1d..ab6781018 100644
--- a/src/Server.UI/Pages/Identity/Users/Users.razor
+++ b/src/Server.UI/Pages/Identity/Users/Users.razor
@@ -389,7 +389,7 @@
             { x => x.UserProfile, UserProfile }
         };
         var options = new DialogOptions { CloseButton = true, CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = DialogService.Show<UserFormDialog>(title, parameters, options);
+        var dialog = await DialogService.ShowAsync<UserFormDialog>(title, parameters, options);
         var result = await dialog.Result;
         if (result is not null && !result.Canceled)
         {
@@ -405,7 +405,7 @@
             { x => x.UserProfile, UserProfile }
         };
         var options = new DialogOptions { CloseButton = true, CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = DialogService.Show<UserFormDialog>(title, parameters, options);
+        var dialog = await DialogService.ShowAsync<UserFormDialog>(title, parameters, options);
         var result = await dialog.Result;
         if (result is not null && !result.Canceled)
         {
@@ -673,7 +673,7 @@
             { x => x.Model, model }
         };
         var options = new DialogOptions { CloseOnEscapeKey = true, CloseButton = true, MaxWidth = MaxWidth.ExtraSmall };
-        var dialog = DialogService.Show<ResetPasswordDialog>(L["Set Password"], parameters, options);
+        var dialog = await DialogService.ShowAsync<ResetPasswordDialog>(L["Set Password"], parameters, options);
         var result = await dialog.Result;
         if (result is not null && !result.Canceled)
         {
diff --git a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
index 8f342cd95..0837addf4 100644
--- a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
+++ b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
@@ -263,7 +263,7 @@
             { nameof(CreatePicklistDialog.Model), command }
         };
         var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = DialogService.Show<CreatePicklistDialog>(title, parameters, options);
+        var dialog = await DialogService.ShowAsync<CreatePicklistDialog>(title, parameters, options);
         var state = await dialog.Result;
         if (state is not null && !state.Canceled)
         {
diff --git a/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor b/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor
index 37ed3d00f..5a9f697df 100644
--- a/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor
+++ b/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor
@@ -142,7 +142,7 @@
                 { x => x.ContentText, $"{L["Are you sure you want to erase this image?"]}" }
             };
             var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall, FullWidth = true };
-            var dialog = DialogService.Show<ConfirmationDialog>($"{L["Erase imatge"]}", parameters, options);
+            var dialog = await DialogService.ShowAsync<ConfirmationDialog>($"{L["Erase imatge"]}", parameters, options);
             var state = await dialog.Result;
 
             if (state is not null && !state.Canceled)
diff --git a/src/Server.UI/Pages/Products/Products.razor b/src/Server.UI/Pages/Products/Products.razor
index e3c1258e5..3591d2a99 100644
--- a/src/Server.UI/Pages/Products/Products.razor
+++ b/src/Server.UI/Pages/Products/Products.razor
@@ -271,7 +271,7 @@
             { x => x.Model, command }
         };
         var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Medium, FullWidth = true };
-        var dialog = DialogService.Show<ProductFormDialog>(title, parameters, options);
+        var dialog =await DialogService.ShowAsync<ProductFormDialog>(title, parameters, options);
         var state = await dialog.Result;
 
         if (state is not null && !state.Canceled)
diff --git a/src/Server.UI/Pages/Tenants/Tenants.razor b/src/Server.UI/Pages/Tenants/Tenants.razor
index c82d2d9c5..48de36906 100644
--- a/src/Server.UI/Pages/Tenants/Tenants.razor
+++ b/src/Server.UI/Pages/Tenants/Tenants.razor
@@ -188,7 +188,7 @@
             { x => x.Model, command }
         };
         var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = DialogService.Show<TenantFormDialog>(title, parameters, options);
+        var dialog =await DialogService.ShowAsync<TenantFormDialog>(title, parameters, options);
         var state = await dialog.Result;
         if (state is not null &&  !state.Canceled)
         {