diff --git a/src/BootstrapBlazor.Server/Components/Pages/Coms.razor.cs b/src/BootstrapBlazor.Server/Components/Pages/Coms.razor.cs
index 49240cb7b44..b5bb0c2896c 100644
--- a/src/BootstrapBlazor.Server/Components/Pages/Coms.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Pages/Coms.razor.cs
@@ -20,7 +20,7 @@ public sealed partial class Coms
         return Task.FromResult<IEnumerable<string?>>(ComponentItems.Where(i => i.Contains(searchText, StringComparison.OrdinalIgnoreCase)).ToList());
     }
 
-    private Task OnClear(string searchText)
+    private Task OnClear()
     {
         SearchText = "";
         StateHasChanged();
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Searches.razor b/src/BootstrapBlazor.Server/Components/Samples/Searches.razor
index 913d2338af5..c7910359a36 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Searches.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Searches.razor
@@ -23,8 +23,7 @@
            Name="DisplayButton">
     <Search PlaceHolder="@Localizer["SearchesPlaceHolder"]"
             ShowClearButton="true"
-            OnSearch="@OnDisplaySearch"
-            OnClear="@OnClear"></Search>
+            OnSearch="@OnDisplaySearch"></Search>
     <ConsoleLogger @ref="DisplayLogger"></ConsoleLogger>
 </DemoBlock>
 
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Searches.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Searches.razor.cs
index 3ca4a984bfe..d1dcf1229c9 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Searches.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Searches.razor.cs
@@ -40,12 +40,6 @@ private Task<IEnumerable<string>> OnDisplaySearch(string searchText)
         return Task.FromResult<IEnumerable<string>>([$"{searchText}1", $"{searchText}12", $"{searchText}123"]);
     }
 
-    private Task<IEnumerable<string>> OnClear(string searchText)
-    {
-        DisplayLogger.Log($"OnClear: {searchText}");
-        return Task.FromResult<IEnumerable<string>>([$"{searchText}1", $"{searchText}12", $"{searchText}123"]);
-    }
-
     [NotNull]
     private ConsoleLogger? KeyboardLogger { get; set; }
 
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 62001c6901d..4b7f96c6e3d 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.5.13-beta01</Version>
+    <Version>9.6.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
index d34bc8063f1..fecb677a7bf 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
@@ -3,34 +3,32 @@
 @inherits BootstrapComponentBase
 
 <div class="@ClassString">
-    <CascadingValue Value="@_editorItems" IsFixed="true">
+    <CascadingValue Value="@_editorItems" IsFixed="false">
         @FieldItems?.Invoke(Model)
     </CascadingValue>
     <CascadingValue Value="this" Name="EditorForm">
-        <RenderTemplate>
-            @if (ShowUnsetGroupItemsOnTop)
+        @if (ShowUnsetGroupItemsOnTop)
+        {
+            if (UnsetGroupItems.Any())
             {
-                if (UnsetGroupItems.Any())
-                {
-                    @RenderUnsetGroupItems
-                }
-                @foreach (var g in GroupItems)
-                {
-                    @RenderGroupItems(g)
-                }
+                @RenderUnsetGroupItems
             }
-            else
+            @foreach (var g in GroupItems)
             {
-                @foreach (var g in GroupItems)
-                {
-                    @RenderGroupItems(g)
-                }
-                if (UnsetGroupItems.Any())
-                {
-                    @RenderUnsetGroupItems
-                }
+                @RenderGroupItems(g)
+            }
+        }
+        else
+        {
+            @foreach (var g in GroupItems)
+            {
+                @RenderGroupItems(g)
+            }
+            if (UnsetGroupItems.Any())
+            {
+                @RenderUnsetGroupItems
             }
-        </RenderTemplate>
+        }
     </CascadingValue>
 
     @if (Buttons != null)
diff --git a/src/BootstrapBlazor/Components/Search/Search.razor.cs b/src/BootstrapBlazor/Components/Search/Search.razor.cs
index f12f326fb85..662e584541c 100644
--- a/src/BootstrapBlazor/Components/Search/Search.razor.cs
+++ b/src/BootstrapBlazor/Components/Search/Search.razor.cs
@@ -146,7 +146,7 @@ public partial class Search<TValue>
     /// Gets or sets the event callback when the clear button is clicked. Default is null.
     /// </summary>
     [Parameter]
-    public Func<string?, Task>? OnClear { get; set; }
+    public Func<Task>? OnClear { get; set; }
 
     [Inject]
     [NotNull]
@@ -221,18 +221,17 @@ private async Task OnSearchClick()
             {
                 await InvokeVoidAsync("showList", Id);
             }
-            StateHasChanged();
         }
     }
 
     private async Task OnClearClick()
     {
+        _displayText = "";
         if (OnClear != null)
         {
-            await OnClear(_displayText);
+            await OnClear();
         }
-        _displayText = "";
-        _filterItems = [];
+        await OnSearchClick();
     }
 
     private string? GetDisplayText(TValue item)
@@ -272,6 +271,7 @@ public async Task TriggerFilter(string val)
         if (IsTriggerSearchByInput)
         {
             await OnSearchClick();
+            StateHasChanged();
         }
         _dropdown.Render();
     }
diff --git a/test/UnitTest/Components/SearchTest.cs b/test/UnitTest/Components/SearchTest.cs
index 3ca2c7cdd73..841152a748e 100644
--- a/test/UnitTest/Components/SearchTest.cs
+++ b/test/UnitTest/Components/SearchTest.cs
@@ -138,7 +138,7 @@ public async Task OnClearClick_Ok()
             builder.Add(s => s.ClearButtonColor, Color.Secondary);
             builder.Add(s => s.ClearButtonIcon, "test-icon");
             builder.Add(s => s.ClearButtonText, "Clear");
-            builder.Add(s => s.OnClear, v =>
+            builder.Add(s => s.OnClear, () =>
             {
                 ret = true;
                 return Task.CompletedTask;