diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
index 4a4d4df722..99d0f2a4c3 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
@@ -269,7 +269,7 @@ namespace Volo.Abp.BlazoriseUI
 
             await GetEntitiesAsync();
 
-            StateHasChanged();
+            await InvokeAsync(StateHasChanged);
         }
 
         protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs<TListViewModel> e)
@@ -282,7 +282,7 @@ namespace Volo.Abp.BlazoriseUI
 
             await GetEntitiesAsync();
 
-            StateHasChanged();
+            await InvokeAsync(StateHasChanged);
         }
 
         protected virtual async Task OpenCreateModalAsync()
@@ -295,7 +295,7 @@ namespace Volo.Abp.BlazoriseUI
 
             // Mapper will not notify Blazor that binded values are changed
             // so we need to notify it manually by calling StateHasChanged
-            await InvokeAsync(() => StateHasChanged());
+            await InvokeAsync(StateHasChanged);
 
             CreateModal.Show();
         }
@@ -317,7 +317,7 @@ namespace Volo.Abp.BlazoriseUI
             EditingEntityId = entity.Id;
             EditingEntity = MapToEditingEntity(entityDto);
 
-            await InvokeAsync(() => StateHasChanged());
+            await InvokeAsync(StateHasChanged);
 
             EditModal.Show();
         }
@@ -362,11 +362,8 @@ namespace Volo.Abp.BlazoriseUI
                 await CheckCreatePolicyAsync();
                 var createInput = MapToCreateInput(NewEntity);
                 await AppService.CreateAsync(createInput);
-                await GetEntitiesAsync();
 
                 await OnCreatedEntityAsync();
-
-                CreateModal.Hide();
             }
         }
 
@@ -375,9 +372,11 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual Task OnCreatedEntityAsync()
+        protected virtual async Task OnCreatedEntityAsync()
         {
-            return Task.CompletedTask;
+            await GetEntitiesAsync();
+
+            CreateModal.Hide();
         }
 
         protected virtual async Task UpdateEntityAsync()
@@ -389,11 +388,8 @@ namespace Volo.Abp.BlazoriseUI
                 await CheckUpdatePolicyAsync();
                 var updateInput = MapToUpdateInput(EditingEntity);
                 await AppService.UpdateAsync(EditingEntityId, updateInput);
-                await GetEntitiesAsync();
 
                 await OnUpdatedEntityAsync();
-
-                EditModal.Hide();
             }
         }
 
@@ -402,9 +398,11 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual Task OnUpdatedEntityAsync()
+        protected virtual async Task OnUpdatedEntityAsync()
         {
-            return Task.CompletedTask;
+            await GetEntitiesAsync();
+
+            EditModal.Hide();
         }
 
         protected virtual async Task DeleteEntityAsync(TListViewModel entity)