diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 430d41680a3f8f1b5d8a15d6f4294293c955a5cf..6f6d050e9a300d707edfc704ab3f78e250aa5271 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>5.4.2</Version>
+    <Version>5.4.3</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 4d9b334bd19ee2b73d5e27156be305181100f421..f29d171f837e18d2770bd8842523a007fb62cd19 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -584,7 +584,10 @@ RenderFragment<TItem> RenderRow => item =>
         <td class="@FixedExtendButtonsColumnClassString" style="@GetFixedExtendButtonsColumnStyleString()">
             <div class="table-cell">
                 <div class="btn-group" @onclick:stopPropagation="true">
-                    @BeforeRowButtonTemplate?.Invoke(item)
+                    @if (!isInCell)
+                    {
+                        @BeforeRowButtonTemplate?.Invoke(item)
+                    }
                     @if (ShowDefaultButtons)
                     {
                         @if (GetShowEditButton(item))
@@ -592,30 +595,27 @@ RenderFragment<TItem> RenderRow => item =>
                             @if (isInCell)
                             {
                                 <Button Size="Size.ExtraSmall" OnClick="@ClickUpdateButtonCallback()" Color="Color.Success" Icon="fa fa-edit" Text="@UpdateButtonText" />
+                                <Button Size="Size.ExtraSmall" OnClick="@CancelSave()" Color="Color.Warning" Icon="fa fa-times" Text="@CancelButtonText" />
                             }
                             else
                             {
                                 <Button Size="Size.ExtraSmall" OnClick="@ClickEditButtonCallback(item)" Icon="fa fa-edit" Text="@EditButtonText" />
                             }
                         }
-                        @if (GetShowDeleteButton(item))
+                        @if (!isInCell && GetShowDeleteButton(item))
                         {
-                            @if (isInCell)
-                            {
-                                <Button Size="Size.ExtraSmall" OnClick="@CancelSave()" Color="Color.Warning" Icon="fa fa-times" Text="@CancelButtonText" />
-                            }
-                            else
-                            {
-                                <PopConfirmButton Placement="Placement.Left" Size="Size.ExtraSmall"
-                                                  Color="Color.Danger" Icon="fa fa-remove" Text="@DeleteButtonText"
-                                                  CloseButtonText="@CancelDeleteButtonText" Content="@ConfirmDeleteContentText"
-                                                  ConfirmButtonColor="Color.Danger" ConfirmButtonText="@ConfirmDeleteButtonText"
-                                                  OnBeforeClick="@ClickBeforeDelete(item)"
-                                                  OnConfirm="@DeleteAsync()" />
-                            }
+                            <PopConfirmButton Placement="Placement.Left" Size="Size.ExtraSmall"
+                                                Color="Color.Danger" Icon="fa fa-remove" Text="@DeleteButtonText"
+                                                CloseButtonText="@CancelDeleteButtonText" Content="@ConfirmDeleteContentText"
+                                                ConfirmButtonColor="Color.Danger" ConfirmButtonText="@ConfirmDeleteButtonText"
+                                                OnBeforeClick="@ClickBeforeDelete(item)"
+                                                OnConfirm="@DeleteAsync()" />
                         }
                     }
-                    @RowButtonTemplate?.Invoke(item)
+                    @if (!isInCell)
+                    {
+                        @RowButtonTemplate?.Invoke(item)
+                    }
                 </div>
             </div>
         </td>