diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
index 6a46a162d..22fbe9bc4 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
@@ -195,6 +195,12 @@ export class DmpEditorComponent extends BaseEditor<DmpEditorModel, Dmp> implemen
 
 	prepareForm(data: Dmp) {
 		try {
+			if (data?.blueprint?.definition?.sections != null) {
+				data.blueprint.definition.sections = data.blueprint.definition.sections.sort((s1,s2) => s1.ordinal-s2.ordinal);
+				for (let i=0; i<data.blueprint.definition.sections.length; i++){
+					data.blueprint.definition.sections[i].fields = data.blueprint.definition.sections[i]?.fields?.sort((f1,f2) => f1.ordinal-f2.ordinal);
+				}
+			}
 			this.editorModel = data ? new DmpEditorModel().fromModel(data) : new DmpEditorModel();
 			if (data) {
 				if (data.descriptions) {