diff --git a/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.html b/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.html
index 60bfc00..7a47a11 100644
--- a/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.html
+++ b/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.html
@@ -61,7 +61,7 @@
   let-control="control" let-field="field">
   <mat-form-field *ngIf="field.options$ | async as options">
     <mat-label>{{field.label}}</mat-label>
-    <mat-select [formControl]="control" [disabled]="field.readonly">
+    <mat-select [formControl]="control">
       <mat-option *ngFor="let option of options" [value]="option.value">
         {{option.label}}
       </mat-option>
diff --git a/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.ts b/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.ts
index 8539297..2473c99 100644
--- a/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.ts
+++ b/src/main/frontend/src/app/modules/shared/components/entity-edit/entity-edit.component.ts
@@ -38,7 +38,7 @@ export class EntityEditComponent extends SubscribingComponent {
   ngOnInit() {
     const formGroup = {}
     this.formFields.forEach(f => {
-      formGroup[f.name] = new FormControl(f.valueFn ? f.valueFn(this.entity) : this.entity[f.name], f.validator)
+      formGroup[f.name] = new FormControl({value: f.valueFn ? f.valueFn(this.entity) : this.entity[f.name], disabled: f.readonly}, f.validator)
     })
     this.form = this.formBuilder.group(formGroup)