diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index 77812f60a..d2f8b1047 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -185,9 +185,12 @@
                     <div class="col text-center">
                         <label for="Container" class="control-label">@Localizer["Container"]</label>
                         <select class="form-select" @bind="@_containerType">
-                            @foreach (var container in _containers)
+                            @if (_containers != null)
                             {
-                                <option value="@container.TypeName">@container.Name</option>
+                                foreach (var container in _containers)
+                                {
+                                    <option value="@container.TypeName">@container.Name</option>
+                                }
                             }
                         </select>
                     </div>
@@ -284,8 +287,7 @@
                 }
             }
 
-            var themes = await ThemeService.GetThemesAsync();
-            _containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
+            _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
             _containerType = PageState.Site.DefaultContainerType;
             _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
             _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index e37aac519..ee09f0aa2 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -299,9 +299,12 @@
                         RenderId = Guid.NewGuid(),
                         Refresh = false
                     };
-
                     OnStateChange?.Invoke(_pagestate);
-                    await ScrollToFragment(_pagestate.Uri);
+
+                    if (PageState.RenderMode == RenderModes.Interactive)
+                    {
+                        await ScrollToFragment(_pagestate.Uri);
+                    }
                 }
                 else
                 {