diff --git a/packages/survey-creator-core/src/components/tabs/theme-builder.ts b/packages/survey-creator-core/src/components/tabs/theme-builder.ts
index b7be7b7989..79edc7f9a3 100644
--- a/packages/survey-creator-core/src/components/tabs/theme-builder.ts
+++ b/packages/survey-creator-core/src/components/tabs/theme-builder.ts
@@ -641,9 +641,10 @@ export class ThemeBuilder extends Base {
   protected createThemeEditorSurvey(): SurveyModel {
     const json = this.getThemeEditorSurveyJSON();
     setSurveyJSONForPropertyGrid(json, true, false);
-    const themeEditorSurvey = this.surveyProvider.createSurvey(json, "theme_editor", this);
+    const themeEditorSurvey = this.surveyProvider.createSurvey({}, "theme_editor", this);
     themeEditorSurvey.lazyRendering = true;
     themeEditorSurvey.lazyRenderingFirstBatchSize = 1;
+    themeEditorSurvey.setJsonObject(json);
     themeEditorSurvey.getCss().list = {};
     const themeBuilderCss = { ...propertyGridCss };
     themeBuilderCss.root += " spg-theme-builder-root";
diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss
index 45823c9eae..f619a7b1db 100644
--- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss
+++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss
@@ -1,4 +1,8 @@
 .spg-theme-builder-root {
+  .sv-skeleton-element {
+    min-height: 50px;
+  }
+
   .spg-paneldynamic__separator {
     border: none;
     margin: 0;
diff --git a/visualRegressionTests/tests/designer/theme-tab.ts b/visualRegressionTests/tests/designer/theme-tab.ts
index 39db05b82d..9791e0ac19 100644
--- a/visualRegressionTests/tests/designer/theme-tab.ts
+++ b/visualRegressionTests/tests/designer/theme-tab.ts
@@ -17,7 +17,8 @@ test("Check boxshadow settings", async (t) => {
     await t.resizeWindow(2000, 2000)
       .click(getTabbedMenuItemByText("Themes"))
       .click(getPropertyGridCategory("Appearance"))
-      .click(advancedModeSwitcher);
+      .click(advancedModeSwitcher)
+      .scrollIntoView(root);
     await takeElementScreenshot("boxshadow-one-panel.png", root, t, comparer);
     await t.click(".spg-paneldynamic__add-btn");
     await t.hover(root, { offsetX: 0, offsetY: 0 });