diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 22c8680ebc7..8e9f8a95f3c 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
-    <Version>9.11.5-beta08</Version>
+    <Version>9.11.5-beta09</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
-    <Version>10.0.0-rc.2.1.7</Version>
+    <Version>10.0.0-rc.2.1.8</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.js b/src/BootstrapBlazor/Components/Table/Table.razor.js
index 9f5598420ca..f3375ea9e12 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.js
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.js
@@ -218,7 +218,7 @@ export function load(id, method) {
 export function scroll(id, align, options = { behavior: 'smooth' }) {
     const element = document.getElementById(id);
     if (element) {
-        const selectedRow = [...element.querySelectorAll('.form-check.is-checked')].pop();
+        const selectedRow = getSelectedRow(element);
         if (selectedRow) {
             const row = selectedRow.closest('tr');
             if (row) {
@@ -229,6 +229,11 @@ export function scroll(id, align, options = { behavior: 'smooth' }) {
     }
 }
 
+const getSelectedRow = element => {
+    const rows = [...element.querySelectorAll('tr.active')];
+    return rows.pop();
+}
+
 export function scrollTo(id) {
     const element = document.getElementById(id);
     if (element) {