diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 473f55f5005..9d5cf50dda2 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.0.2-beta01</Version>
+    <Version>9.0.2-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss
index 052bdf5a8b5..175d64241e3 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss
@@ -132,10 +132,6 @@
 
         .tabs.tabs-border-card {
             box-shadow: none;
-            margin: -1rem;
-            border: none;
-            border-radius: unset;
-            min-height: calc(100% + 2rem);
         }
     }
 
@@ -237,22 +233,10 @@
     }
 
     &.is-fixed-tab {
-        .layout-main {
-            height: calc(var(--bb-layout-height) - var(--bb-layout-header-height) - var(--bb-layout-footer-height));
-        }
-
-        .tabs-body {
-            height: calc(100% - var(--bb-tabs-item-height));
-            overflow: auto;
-
-            .tabs-body-content {
-                height: auto;
-                min-height: 100%;
-            }
-        }
-
-        &:not(.has-footer) {
-            --bb-layout-footer-height: 0;
+        .tabs-header {
+            position: sticky;
+            top: var(--bb-layout-header-height);
+            z-index: 5;
         }
     }
 }