diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Layouts.razor b/src/BootstrapBlazor.Shared/Components/Samples/Layouts.razor
index 4263f73adcc..4f5f2437d7b 100644
--- a/src/BootstrapBlazor.Shared/Components/Samples/Layouts.razor
+++ b/src/BootstrapBlazor.Shared/Components/Samples/Layouts.razor
@@ -40,7 +40,7 @@
            Introduction="@Localizer["LayoutsUpAndDownIntro"]"
            Name="UpAndDown">
     <div class="layout-demo">
-        <Layout ShowFooter="true">
+        <Layout ShowFooter="true" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
             <Header>
                 <div>Header</div>
             </Header>
@@ -58,7 +58,7 @@
            Introduction="@Localizer["LayoutsMiddleLeftRightIntro"]"
            Name="MiddleLeftRight">
     <div class="layout-demo">
-        <Layout ShowFooter="true">
+        <Layout ShowFooter="true" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
             <Header>
                 <div>Header</div>
             </Header>
@@ -79,7 +79,7 @@
            Introduction="@Localizer["LayoutsLeftRightIntro"]"
            Name="LeftRight">
     <div class="layout-demo">
-        <Layout ShowFooter="true" IsFullSide="true">
+        <Layout ShowFooter="true" IsFullSide="true" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
             <Header>
                 <div>Header</div>
             </Header>
@@ -100,7 +100,7 @@
            Introduction="@Localizer["LayoutsCustomPercentIntro"]"
            Name="CustomPercent">
     <div class="layout-demo">
-        <Layout ShowFooter="true" SideWidth="200">
+        <Layout ShowFooter="true" SideWidth="200" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
             <Header>
                 <div>Header</div>
             </Header>
@@ -140,7 +140,7 @@
         @((MarkupString)Localizer["LayoutsAppTips7"].Value)
     </Tips>
     <div class="layout-demo1">
-        <Layout ShowFooter="true" SideWidth="160px" Menus="IconSideMenuItems1">
+        <Layout ShowFooter="true" SideWidth="160px" Menus="IconSideMenuItems1" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
             <Header>
                 <div>Header</div>
             </Header>
@@ -158,7 +158,7 @@
         @Localizer["LayoutsAppTips8"]
     </p>
     <div class="layout-demo2">
-        <Layout ShowFooter="true" SideWidth="160px" Menus="IconSideMenuItems2">
+        <Layout ShowFooter="true" SideWidth="160px" Menus="IconSideMenuItems2" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
             <Header>
                 <div>Header</div>
             </Header>
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
index 3e69a3defb5..451e02a8090 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -29,7 +29,7 @@
                         }
                         @if (Menus != null)
                         {
-                            @RenderMenu(IsFullSide)
+                            @RenderMenu
                         }
                     </aside>
                     <section class="layout-right">
@@ -58,7 +58,7 @@
                             }
                             @if (Menus != null)
                             {
-                                @RenderMenu(IsFullSide)
+                                @RenderMenu
                             }
                         </aside>
                         @RenderMain
@@ -100,9 +100,9 @@
         @Header
     </header>;
 
-    RenderFragment<bool> RenderMenu => hasScroll =>
+    RenderFragment RenderMenu =>
     @<div class="layout-menu">
-        @if (hasScroll)
+        @if (IsFixedTabHeader || IsFullSide)
         {
             <Scroll>
                 <Menu Items="@Menus" IsVertical="true" IsAccordion="@IsAccordion" OnClick="ClickMenu"></Menu>
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss
index 2223199b970..142b1e6e09f 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss
@@ -233,6 +233,7 @@
     }
 
     &.is-fixed-tab {
+        .layout-menu,
         .tabs {
             height: calc(var(--bb-layout-height) - var(--bb-layout-header-height) - var(--bb-layout-footer-height));
 
@@ -278,6 +279,10 @@
                     top: 0;
                     height: var(--bb-layout-height);
                 }
+
+                .layout-menu {
+                    height: calc(var(--bb-layout-height) - var(--bb-layout-header-height));
+                }
             }
         }