diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.scss b/src/BootstrapBlazor/Components/Table/Table.razor.scss
index 473772d463d..3a55e3396e0 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.scss
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.scss
@@ -327,7 +327,14 @@
 .btn-gear .dropdown-menu .dropdown-item {
     padding: 6px 12px;
     display: table-cell;
-    color: #504d4d;
+
+    &:not(.disabled) {
+        color: #504d4d;
+    }
+
+    &.disabled {
+        pointer-events: auto;
+    }
 }
 
 .btn-gear .dropdown-menu .dropdown-item:not(:first-child) {
diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor b/src/BootstrapBlazor/Components/Table/TableToolbar.razor
index 44687e8973c..d3a6b821c10 100644
--- a/src/BootstrapBlazor/Components/Table/TableToolbar.razor
+++ b/src/BootstrapBlazor/Components/Table/TableToolbar.razor
@@ -11,7 +11,7 @@
             <div class="@ToolbarClassString">
                 @foreach (var button in _buttons)
                 {
-                    @if (button is TableToolbarButton<TItem> b && b.IsShow)
+                    @if (button is TableToolbarButton<TItem> { IsShow: true } b)
                     {
                         <Button AdditionalAttributes="b.AdditionalAttributes" Size="b.Size"
                                 Color="@b.Color" Icon="@b.Icon" Text="@b.Text" IsAsync="@b.IsAsync"
@@ -19,7 +19,7 @@
                                 TooltipText="@b.TooltipText" TooltipPlacement="@b.TooltipPlacement" TooltipTrigger="@b.TooltipTrigger"
                                 IsDisabled="GetDisabled(b)"></Button>
                     }
-                    else if (button is TableToolbarPopConfirmButton<TItem> pb && pb.IsShow)
+                    else if (button is TableToolbarPopConfirmButton<TItem> { IsShow: true } pb)
                     {
                         <PopConfirmButton AdditionalAttributes="pb.AdditionalAttributes" CustomClass="@pb.CustomClass"
                                           Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text" Size="pb.Size" ShowShadow="@pb.ShowShadow"
@@ -31,7 +31,7 @@
                                           CloseButtonText="@pb.CloseButtonText" Content="@pb.Content">
                         </PopConfirmButton>
                     }
-                    else if (button is TableToolbarComponent<TItem> cb && cb.IsShow)
+                    else if (button is TableToolbarComponent<TItem> { IsShow: true } cb)
                     {
                         <CascadingValue Value="OnGetSelectedRows" IsFixed="true">
                             @cb.ChildContent
@@ -48,31 +48,36 @@
                     <div class="dropdown-menu">
                         @foreach (var button in _buttons)
                         {
-                            @if (button is TableToolbarButton<TItem> { IsShow: true } b)
+                            @switch (button)
                             {
-                                <div class="dropdown-item" @onclick="e => OnToolbarButtonClick(b)">
-                                    @if (string.IsNullOrEmpty(b.Icon))
-                                    {
-                                        <span>@b.Text</span>
-                                    }
-                                    else
-                                    {
-                                        <i class="@b.Icon"></i>
-                                    }
-                                </div>
-                            }
-                            else if (button is TableToolbarPopConfirmButton<TItem> { IsShow: true } pb)
-                            {
-                                <div class="dropdown-item" @onclick="pb.OnConfirm">
-                                    @if (string.IsNullOrEmpty(pb.Icon))
-                                    {
-                                        <span>@pb.Text</span>
-                                    }
-                                    else
-                                    {
-                                        <i class="@pb.Icon"></i>
-                                    }
-                                </div>
+                                case TableToolbarButton<TItem> { IsShow: true } b:
+                                {
+                                    <DynamicElement class="@GetItemClass(b)" TriggerClick="!GetDisabled(b)" OnClick="() => OnToolbarButtonClick(b)">
+                                        @if (string.IsNullOrEmpty(b.Icon))
+                                        {
+                                            <span>@b.Text</span>
+                                        }
+                                        else
+                                        {
+                                            <i class="@b.Icon"></i>
+                                        }
+                                    </DynamicElement>
+                                    break;
+                                }
+                                case TableToolbarPopConfirmButton<TItem> { IsShow: true } pb:
+                                {
+                                    <DynamicElement class="@GetItemClass(pb)" TriggerClick="!GetDisabled(pb)" OnClick="pb.OnConfirm">
+                                        @if (string.IsNullOrEmpty(pb.Icon))
+                                        {
+                                            <span>@pb.Text</span>
+                                        }
+                                        else
+                                        {
+                                            <i class="@pb.Icon"></i>
+                                        }
+                                    </DynamicElement>
+                                    break;
+                                }
                             }
                         }
                     </div>
diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs b/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
index 5727997e578..0d8516e4617 100644
--- a/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
@@ -50,6 +50,10 @@ public partial class TableToolbar<TItem> : ComponentBase
         .AddClass("d-none d-sm-inline-flex", IsAutoCollapsedToolbarButton)
         .Build();
 
+    private string? GetItemClass(ButtonBase button) => CssBuilder.Default("dropdown-item")
+        .AddClass("disabled", GetDisabled(button))
+        .Build();
+
     private async Task OnToolbarButtonClick(TableToolbarButton<TItem> button)
     {
         _asyncButtonStateCache.TryGetValue(button, out var disabled);