diff --git a/src/components/forms/custom-form-builder.tsx b/src/components/forms/custom-form-builder.tsx
index b92acb3..c9df8ca 100644
--- a/src/components/forms/custom-form-builder.tsx
+++ b/src/components/forms/custom-form-builder.tsx
@@ -641,6 +641,12 @@ export function CustomFormBuilder() {
     setFontFamily(t.font_family);
     setFontSize(t.font_size_pt);
     editor.commands.setContent(t.body_html || "<p></p>");
+    const loadedFields = Array.isArray(t.fields) ? t.fields : [];
+    setFormFields(loadedFields);
+    // seed values with defaults
+    const seeded: Record<string, string> = {};
+    for (const f of loadedFields) if (f.default) seeded[f.key] = f.default;
+    setFieldValues(seeded);
     setActiveTemplateId(t.id);
     setLoadDialogOpen(false);
     toast.success(`Loaded "${t.name}"`);