diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 59602f9302b4bc2d9d473a4521f27c2bf5b13be0..01e7753a8321ecd4ba02cb71d5c93374b0f1fcb2 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>6.5.18</Version>
+    <Version>6.5.19</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
diff --git a/src/BootstrapBlazor/Components/Button/Button.razor b/src/BootstrapBlazor/Components/Button/Button.razor
index c1b1960d152ebf967a68e5f782e65f077a5e6b67..7360f22f34f3ada7f5b4142cd7745bd9d99d210c 100644
--- a/src/BootstrapBlazor/Components/Button/Button.razor
+++ b/src/BootstrapBlazor/Components/Button/Button.razor
@@ -1,7 +1,7 @@
 @namespace BootstrapBlazor.Components
 @inherits ButtonBase
 
-<button @attributes="@AdditionalAttributes" type="@ButtonType.ToDescriptionString()" @onclick="@OnClickButton" id="@Id" class="@ClassName" disabled="@Disabled" role="button" aria-disabled="@Disabled" tabindex="@Tab" @onclick:stopPropagation="@StopPropagation">
+<button @attributes="@AdditionalAttributes" type="@ButtonType.ToDescriptionString()" @onclick="@OnClickButton" id="@Id" class="@ClassName" disabled="@Disabled" role="button" aria-disabled="@Disabled" tabindex="@Tab" @onclick:stopPropagation="@StopPropagation" @ref="ButtonElement">
     @if(!string.IsNullOrEmpty(ButtonIcon))
     {
         <i class="@ButtonIcon"></i>
diff --git a/src/BootstrapBlazor/Components/Button/Button.razor.cs b/src/BootstrapBlazor/Components/Button/Button.razor.cs
index b85434b47b3c5590bfdc6f3337d23689f4c30505..496bb47b3f03bd72cb890b420793394a1638a0f2 100644
--- a/src/BootstrapBlazor/Components/Button/Button.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/Button.razor.cs
@@ -12,6 +12,12 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public partial class Button
 {
+    /// <summary>
+    /// 获得/设置 是否自动获取焦点 默认 false 不自动获取焦点
+    /// </summary>
+    [Parameter]
+    public bool IsAutoFocus { get; set; }
+
     /// <summary>
     /// 按钮点击回调方法，内置支持 IsAsync 开关
     /// </summary>
@@ -23,6 +29,11 @@ public partial class Button
     [CascadingParameter]
     protected ValidateForm? ValidateForm { get; set; }
 
+    /// <summary>
+    /// 获得/设置 html button 实例
+    /// </summary>
+    protected ElementReference ButtonElement { get; set; }
+
     /// <summary>
     /// OnInitialized 方法
     /// </summary>
@@ -80,6 +91,30 @@ public partial class Button
         }
     }
 
+    /// <summary>
+    /// OnAfterRenderAsync 方法
+    /// </summary>
+    /// <param name="firstRender"></param>
+    /// <returns></returns>
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await base.OnAfterRenderAsync(firstRender);
+
+        if (firstRender)
+        {
+            if (IsAutoFocus)
+            {
+                await FocusAsync();
+            }
+        }
+    }
+
+    /// <summary>
+    /// 自动获得焦点方法
+    /// </summary>
+    /// <returns></returns>
+    public ValueTask FocusAsync() => ButtonElement.FocusAsync();
+
     /// <summary>
     /// 处理点击方法
     /// </summary>
diff --git a/test/UnitTest/Components/ButtonTest.cs b/test/UnitTest/Components/ButtonTest.cs
index bd69746b4574c58fce57c7b46d7c9999d76dd3ac..f8376be47f6a6e7e1b8dbbac66737f19c69ff4a5 100644
--- a/test/UnitTest/Components/ButtonTest.cs
+++ b/test/UnitTest/Components/ButtonTest.cs
@@ -6,7 +6,6 @@ using BootstrapBlazor.Shared;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using UnitTest.Extensions;
 
 namespace UnitTest.Components;
 
@@ -335,4 +334,13 @@ public class ButtonTest : BootstrapBlazorTestBase
         var cut = Context.RenderComponent<Button>();
         await cut.InvokeAsync(() => cut.Instance.RemoveTooltip());
     }
+
+    [Fact]
+    public void IsAutoFocus_Ok()
+    {
+        var cut = Context.RenderComponent<Button>(pb =>
+        {
+            pb.Add(a => a.IsAutoFocus, true);
+        });
+    }
 }