diff --git a/Oqtane.Client/Modules/Controls/TabStrip.razor b/Oqtane.Client/Modules/Controls/TabStrip.razor
index be82b9ffb..d51869309 100644
--- a/Oqtane.Client/Modules/Controls/TabStrip.razor
+++ b/Oqtane.Client/Modules/Controls/TabStrip.razor
@@ -1,7 +1,7 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 
-<CascadingValue Value="this">
+<CascadingValue Value="this" IsFixed="true">
     <div class="container-fluid">
         <div class="form-group">
             <ul class="nav nav-tabs" role="tablist">
diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 41f8268af..6992c34ab 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -1,6 +1,6 @@
 @namespace Oqtane.UI
 
-<CascadingValue Value="@_moduleState">
+<CascadingValue Value="@_moduleState" IsFixed="true">
     @DynamicComponent
 </CascadingValue>
 
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 273404e98..e98995d0b 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -2,7 +2,7 @@
 @inject IStringLocalizer<ModuleInstance> Localizer
 
 <ModuleMessage Message="@_message" Type="@_messagetype" />
-<CascadingValue Value="this">
+<CascadingValue Value="this" IsFixed="true">
     @DynamicComponent
 </CascadingValue>
 @if (_progressindicator)