diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 9607c1e915e..0870eee5144 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.8.1-beta05</Version>
+    <Version>9.8.1-beta06</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 5088c1de3aa..350c0544496 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -47,11 +47,11 @@
                     }
                     @if (ShowDefaultButtons)
                     {
-                        @if (ShowAddButton)
+                        @if (ShowAddButton && ScrollMode == ScrollMode.None)
                         {
                             <TableToolbarButton TItem="TItem" Color="Color.Success" OnClick="AddAsync" Icon="@AddButtonIcon" Text="@AddButtonText" IsDisabled="GetAddButtonStatus()" />
                         }
-                        @if (!IsExcel && ShowEditButton)
+                        @if (!IsExcel && ShowEditButton && ScrollMode == ScrollMode.None)
                         {
                             <TableToolbarButton TItem="TItem" IsDisabled="GetEditButtonStatus()" Color="Color.Primary" OnClick="EditAsync" Icon="@EditButtonIcon" Text="@EditButtonText" IsEnableWhenSelectedOneRow="true" />
                         }
@@ -366,17 +366,6 @@
             @RenderHeader(false)
         }
         <tbody>
-            @if (InsertRowMode == InsertRowMode.First)
-            {
-                if (!IsExcel && EditMode == EditMode.EditForm && ShowAddForm)
-                {
-                    @RenderEditForm.Invoke((EditModel, ItemChangedType.Add))
-                }
-                if (AddInCell)
-                {
-                    @RenderRow(EditModel)
-                }
-            }
             @if (ScrollMode == ScrollMode.Virtual)
             {
                 @if (Items != null)
@@ -394,7 +383,18 @@
             }
             else
             {
-                @foreach (var item in Rows)
+                if (InsertRowMode == InsertRowMode.First)
+                {
+                    if (!IsExcel && EditMode == EditMode.EditForm && ShowAddForm)
+                    {
+                        @RenderEditForm.Invoke((EditModel, ItemChangedType.Add))
+                    }
+                    if (AddInCell)
+                    {
+                        @RenderRow(EditModel)
+                    }
+                }
+                foreach (var item in Rows)
                 {
                     OnBeforeRenderRow?.Invoke(item);
                     if (RowTemplate != null)
@@ -439,7 +439,18 @@
                         @RenderEditForm((EditModel, ItemChangedType.Update))
                     }
                 }
-                @if (IsShowEmpty)
+                if (InsertRowMode == InsertRowMode.Last)
+                {
+                    if (!IsExcel && EditMode == EditMode.EditForm && ShowAddForm)
+                    {
+                        @RenderEditForm.Invoke((EditModel, ItemChangedType.Add))
+                    }
+                    if (AddInCell)
+                    {
+                        @RenderRow(EditModel)
+                    }
+                }
+                if (IsShowEmpty)
                 {
                     <tr>
                         <td colspan="@GetEmptyColumnCount()">
@@ -449,17 +460,6 @@
                     </tr>
                 }
             }
-            @if (InsertRowMode == InsertRowMode.Last)
-            {
-                if (!IsExcel && EditMode == EditMode.EditForm && ShowAddForm)
-                {
-                    @RenderEditForm.Invoke((EditModel, ItemChangedType.Add))
-                }
-                if (AddInCell)
-                {
-                    @RenderRow(EditModel)
-                }
-            }
         </tbody>
         @if (IsShowFooter)
         {
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
index 69bf5288a2a..2efb69731d5 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -1219,7 +1219,7 @@ private Task ExportExcelAsync() => ExecuteExportAsync(() => OnExportAsync != nul
     /// 是否显示行内编辑按钮
     /// </summary>
     /// <returns></returns>
-    protected bool GetShowExtendEditButton(TItem item) => ShowExtendEditButtonCallback?.Invoke(item) ?? ShowExtendEditButton;
+    protected bool GetShowExtendEditButton(TItem item) => ScrollMode != ScrollMode.Virtual && (ShowExtendEditButtonCallback?.Invoke(item) ?? ShowExtendEditButton);
 
     /// <summary>
     /// 是否显示行内删除按钮