diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor
index ce5772ae655b8e284881eae8485bf5186ece7d11..06ba2072e70c23efe4a44ffa0265ebebdaa233a6 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor
@@ -180,7 +180,7 @@
     <p>@((MarkupString)Localizer["FooterTemplateDesc"].Value)</p>
     <Pre>&lt;EditFooterTemplate Context="model"&gt;
     &lt;Button Text="Popup" Color="Color.Danger" Icon="fa-regular fa-comment-dots" OnClick="() =&gt; OnClick(model)"&gt;&lt;/Button&gt;
-    &lt;DialogCloseButton Color="Color.Secondary" Icon="fa-solid fa-xmark" Text="Close" /&gt;
+    &lt;DialogCloseButton /&gt;
     &lt;DialogSaveButton Color="Color.Primary" Icon="fa-solid fa-floppy-disk" Text="Save" /&gt;
 &lt;/EditFooterTemplate&gt;</Pre>
     <Table TItem="Foo" EditDialogShowMaximizeButton="true"
@@ -192,7 +192,7 @@
         </TableColumns>
         <EditFooterTemplate Context="model">
             <Button Text="Popup" Color="Color.Danger" Icon="fa-regular fa-comment-dots" OnClick="() => OnClick(model)"></Button>
-            <DialogCloseButton Color="Color.Secondary" Icon="fa-solid fa-xmark" Text="Close" />
+            <DialogCloseButton />
             <DialogSaveButton Color="Color.Primary" Icon="fa-solid fa-floppy-disk" Text="Save" />
         </EditFooterTemplate>
     </Table>
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 43c71baf3dfc1b8fd4428c7845fda76f2ccb4351..458aee50f3e4585844e2c02bf4903618c4a7f477 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.1.1-beta01</Version>
+    <Version>7.1.1-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs b/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs
index d58e301de00134da922965e990b3994e8d9185ba..651114d4d758278c22ff7cf1ca9643d73a6e9c15 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs
@@ -28,24 +28,25 @@ public partial class DialogCloseButton : Button
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    protected override void OnInitialized()
+    protected override void OnParametersSet()
     {
-        base.OnInitialized();
+        base.OnParametersSet();
 
-        if (OnCloseAsync != null)
-        {
-            OnClickWithoutRender = OnCloseAsync;
-        }
+        ButtonIcon ??= "fa-solid fa-fw fa-xmark";
+        Text ??= Localizer[nameof(ModalDialog.CloseButtonText)];
     }
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    protected override void OnParametersSet()
+    /// <returns></returns>
+    protected override async Task HandlerClick()
     {
-        base.OnParametersSet();
+        await base.HandlerClick();
 
-        ButtonIcon ??= "fa-solid fa-fw fa-xmark";
-        Text ??= Localizer[nameof(ModalDialog.CloseButtonText)];
+        if (OnCloseAsync != null)
+        {
+            await OnCloseAsync();
+        }
     }
 }