diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 76565c6b..bc9b1198 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -31,6 +31,9 @@
     [Parameter]
     public Module ModuleState { get; set; }
 
+    [Parameter]
+    public string ContainerType { get; set; }
+
     protected override bool ShouldRender()
     {
         return PageState?.RenderId == ModuleState?.RenderId;
@@ -44,6 +47,10 @@
     protected override void OnParametersSet()
     {
         string container = ModuleState.ContainerType;
+        if (!string.IsNullOrEmpty(ContainerType))
+        {
+            container = ContainerType;
+        }
         if (PageState.ModuleId != -1 && PageState.Route.Action != "" && ModuleState.UseAdminContainer)
         {
             container = (!string.IsNullOrEmpty(PageState.Site.AdminContainerType)) ? PageState.Site.AdminContainerType : Constants.DefaultAdminContainer;
diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index 633cd4fd..3e5ddfd3 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -26,6 +26,9 @@ else
     [Parameter]
     public string Name { get; set; }
 
+    [Parameter]
+    public string ContainerType { get; set; }
+
     RenderFragment DynamicComponent { get; set; }
 
     protected override void OnParametersSet()
@@ -119,6 +122,7 @@ else
     {
         builder.OpenComponent(0, typeof(ContainerBuilder));
         builder.AddAttribute(1, "ModuleState", module);
+        builder.AddAttribute(2, "ContainerType", ContainerType);
         builder.SetKey(module.PageModuleId);
         builder.CloseComponent();
     }