diff --git a/Oqtane.Client/Themes/Controls/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
index 8b093165..0dd706ee 100644
--- a/Oqtane.Client/Themes/Controls/ModuleTitle.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ContainerBase      
 @attribute [OqtaneIgnore]
 
@@ -17,6 +17,13 @@
         {
             title = PageState.Action;
         }
+        else
+        {
+            if (!string.IsNullOrEmpty(ModuleState.ControlTitle))
+            {
+                title = ModuleState.ControlTitle;
+            }
+        }
         return Task.CompletedTask;
     }
 }
diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index 32abb374..028fca3f 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Rendering
+@using Microsoft.AspNetCore.Components.Rendering
 @namespace Oqtane.UI
 @inject IUserService UserService
 @inject IModuleService ModuleService
@@ -53,8 +53,8 @@ else
                     if (module != null && !module.IsDeleted)
                     {
                         var typename = module.ModuleType;
-                    // check for core module actions component
-                    if (Constants.DefaultModuleActions.Contains(PageState.Action))
+                        // check for core module actions component
+                        if (Constants.DefaultModuleActions.Contains(PageState.Action))
                         {
                             typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, PageState.Action);
                         }
@@ -91,17 +91,13 @@ else
 
                             if (authorized)
                             {
-                                if (!Constants.DefaultModuleActions.Contains(PageState.Action) && module.ControlTitle != "")
-                                {
-                                    module.Title = module.ControlTitle;
-                                }
                                 CreateComponent(builder, module);
                             }
                         }
                         else
                         {
-                        // module control does not exist with name specified
-                    }
+                            // module control does not exist with name specified
+                        }
                     }
                 }
             }
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index c3c63edc..d2854f64 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -442,6 +442,12 @@
         var paneindex = new Dictionary<string, int>();
         foreach (Module module in modules)
         {
+            // initialize module control properties
+            module.SecurityAccessLevel = SecurityAccessLevel.Host;
+            module.ControlTitle = "";
+            module.Actions = "";
+            module.UseAdminContainer = false;
+
             if ((module.PageId == page.PageId || module.ModuleId == moduleid) && module.ModuleDefinition != null)
             {
                 var typename = string.Empty;
@@ -520,6 +526,7 @@
 
                 module.PaneModuleIndex = paneindex[module.Pane.ToLower()];
 
+                // container fallback
                 if (string.IsNullOrEmpty(module.ContainerType))
                 {
                     module.ContainerType = defaultcontainertype;