diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index e464b841182..fec571f73d8 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -197,8 +197,8 @@
                                 {
                                     <Tooltip Placement="Placement.Top" Title="@SearchTooltip" Sanitize="false" IsHtml="true">
                                         <BootstrapInput class="table-toolbar-search" placeholder="@SearchPlaceholderText"
-                                                        @onkeyup="OnSearchKeyUp" Value="@SearchText"
-                                                        OnValueChanged="OnSearchTextValueChanged"
+                                                        Value="@SearchText" SkipValidate="true"
+                                                        OnEnterAsync="OnEnterAsync" OnEscAsync="OnEscAsync"
                                                         ShowLabel="false" UseInputEvent="AutoSearchOnInput">
                                         </BootstrapInput>
                                     </Tooltip>
@@ -206,7 +206,8 @@
                                 else
                                 {
                                     <BootstrapInput class="table-toolbar-search" placeholder="@SearchPlaceholderText"
-                                                    Value="@SearchText" OnValueChanged="OnSearchTextValueChanged"
+                                                    Value="@SearchText" SkipValidate="true"
+                                                    OnEnterAsync="OnEnterAsync" OnEscAsync="OnEscAsync"
                                                     ShowLabel="false" UseInputEvent="AutoSearchOnInput">
                                     </BootstrapInput>
                                 }
@@ -1049,8 +1050,8 @@
                         {
                             <Tooltip Placement="Placement.Top" Title="@SearchTooltip" Sanitize="false" IsHtml="true">
                                 <BootstrapInput class="table-toolbar-search" placeholder="@SearchPlaceholderText"
-                                                @onkeyup="OnSearchKeyUp" Value="@SearchText"
-                                                OnValueChanged="OnSearchTextValueChanged"
+                                                Value="@SearchText"
+                                                OnEnterAsync="OnEnterAsync" OnEscAsync="OnEscAsync"
                                                 ShowLabel="false" SkipValidate="true" UseInputEvent="AutoSearchOnInput">
                                 </BootstrapInput>
                             </Tooltip>
@@ -1058,9 +1059,9 @@
                         else
                         {
                             <BootstrapInput class="table-toolbar-search" placeholder="@SearchPlaceholderText"
-                                            @onkeyup="OnSearchKeyUp" Value="@SearchText"
-                                            OnValueChanged="OnSearchTextValueChanged"
-                                            SkipValidate="true" UseInputEvent="AutoSearchOnInput">
+                                            Value="@SearchText"
+                                            OnEnterAsync="OnEnterAsync" OnEscAsync="OnEscAsync"
+                                            ShowLabel="false" SkipValidate="true" UseInputEvent="AutoSearchOnInput">
                             </BootstrapInput>
                         }
                     }
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
index c2b39038d4d..0dccb568f99 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
-using Microsoft.AspNetCore.Components.Web;
 using System.Reflection;
 
 namespace BootstrapBlazor.Components;
@@ -163,11 +162,22 @@ protected async Task ResetSearchClick()
             Utility.Reset(SearchModel, CreateSearchModel());
         }
 
-        PageIndex = 1;
-        await QueryAsync();
+        await SearchClick();
         await ToggleLoading(false);
     }
 
+    private async Task OnEnterAsync(string? v)
+    {
+        SearchText = v;
+        await SearchClick();
+    }
+
+    private async Task OnEscAsync(string? v)
+    {
+        SearchText = null;
+        await ResetSearchClick();
+    }
+
     /// <summary>
     /// <para lang="zh">查询方法</para>
     /// <para lang="en">Search Method</para>
@@ -304,28 +314,9 @@ protected List<IFilterAction> GetAdvanceSearches()
     /// </summary>
     protected List<IFilterAction> GetSearches() => Columns.Where(col => col.GetSearchable()).ToSearches(SearchText);
 
-    private async Task OnSearchTextValueChanged(string? value)
-    {
-        SearchText = value;
-
-        await SearchClick();
-    }
-
-    private async Task OnSearchKeyUp(KeyboardEventArgs args)
-    {
-        if (args.Key == "Enter")
-        {
-            await SearchClick();
-        }
-        else if (args.Key == "Escape")
-        {
-            await ClearSearchClick();
-        }
-    }
-
     /// <summary>
-    /// <para lang="zh">重置搜索按钮调用此方法</para>
-    /// <para lang="en">Reset Search Button Click Method</para>
+    /// <para lang="zh">点击重置搜索按钮时调用此方法</para>
+    /// <para lang="en">Method called when the reset search button is clicked</para>
     /// </summary>
     protected async Task ClearSearchClick()
     {
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index 432c56e238a..ecb9f481225 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -18,8 +18,8 @@ namespace BootstrapBlazor.Components;
 public partial class Table<TItem> : ITable, IModelEqualityComparer<TItem> where TItem : class
 {
     /// <summary>
-    /// <para lang="zh">获得/设置 a value indicating 是否 automatic search functionality is enabled. 默认 value is false</para>
-    /// <para lang="en">Gets or sets a value indicating whether automatic search functionality is enabled. Default value is false</para>
+    /// <para lang="zh">获得/设置 模糊搜索栏输入时是否自动搜索 默认值 false</para>
+    /// <para lang="en">Gets or sets whether to auto search on fuzzy search bar input. Default false</para>
     /// </summary>
     [Parameter]
     public bool AutoSearchOnInput { get; set; }
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index 8fc51946753..1475c80485c 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -408,10 +408,10 @@ public async Task OnSearchKeyUp_Ok()
                 });
             });
         });
-        var searchBox = cut.Find(".table-toolbar-search");
-        await cut.InvokeAsync(() => searchBox.KeyUp(new KeyboardEventArgs() { Key = "Enter" }));
-        await cut.InvokeAsync(() => searchBox.KeyUp(new KeyboardEventArgs() { Key = "Escape" }));
-        await cut.InvokeAsync(() => searchBox.Change("0"));
+        var searchBox = cut.FindComponents<BootstrapInput<string?>>().FirstOrDefault(i => i.Markup.Contains("table-toolbar-search"));
+        Assert.NotNull(searchBox);
+        await cut.InvokeAsync(() => searchBox.Instance.EnterCallback());
+        await cut.InvokeAsync(() => searchBox.Instance.EscCallback());
         Assert.True(resetSearch);
     }