diff --git a/frontend/src/app/features/content/shared/references/references-editor.component.scss b/frontend/src/app/features/content/shared/references/references-editor.component.scss
index 9bf235a5f..e2dfa2b85 100644
--- a/frontend/src/app/features/content/shared/references/references-editor.component.scss
+++ b/frontend/src/app/features/content/shared/references/references-editor.component.scss
@@ -1,6 +1,15 @@
 @import 'mixins';
 @import 'vars';
 
+:host {
+    &.expanded {
+        @include absolute(3.25rem, 1.25rem, .75rem, 1.25rem);
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+    }
+}
+
 .references-container {
     background: $color-background;
     border: 1px solid $color-border;
@@ -13,8 +22,7 @@
     padding-bottom: 0;
 
     &.expanded {
-        @include absolute(5.5rem, 1.25rem, .75rem, 1.25rem);
-        height: auto;
+        flex-grow: 1;
     }
 }
 
diff --git a/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts b/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
index 708b42b5b..ef9476ac5 100644
--- a/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
+++ b/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
@@ -75,13 +75,15 @@ export class FieldComponent {
             this.isEditable = this.field.canUpdate;
 
             this.editForm = new EditFieldForm(this.field.properties);
+            this.editForm.load(this.field.properties);
         }
     }
 
     public toggleEditing() {
         this.isEditing = !this.isEditing;
-
-        this.editForm.load(this.field.properties);
+        if (this.isEditing) {
+            this.editForm.load(this.field.properties);
+        }
     }
 
     public deleteField() {