diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index b6096044..15185991 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -283,7 +283,6 @@
         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
         {
             LoadSettingsAsync();
-            _pages = await PageService.GetPagesAsync(PageState.Page.SiteId);
             _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
             _containerType = PageState.Site.DefaultContainerType;
             _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Page.SiteId);
@@ -315,9 +314,13 @@
         StateHasChanged();
     }
 
-    private void ModuleTypeChanged(ChangeEventArgs e)
+    private async Task ModuleTypeChanged(ChangeEventArgs e)
     {
         _moduleType = (string)e.Value;
+        if (_moduleType != "new")
+        {
+            _pages = await PageService.GetPagesAsync(PageState.Page.SiteId);
+        }
         _pageId = "-";
         _moduleId = "-";
     }