diff --git a/ui-ngx/src/app/modules/home/components/entity/entity.component.ts b/ui-ngx/src/app/modules/home/components/entity/entity.component.ts
index 1680201262..8d868eff98 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entity.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/entity.component.ts
@@ -50,6 +50,7 @@ export abstract class EntityComponent<T extends BaseData<HasId>,
   @Input()
   set isEdit(isEdit: boolean) {
     this.isEditValue = isEdit;
+    this.cd.markForCheck();
     this.updateFormState();
   }
 
@@ -107,7 +108,6 @@ export abstract class EntityComponent<T extends BaseData<HasId>,
       } else {
         this.entityForm.disable({emitEvent: false});
       }
-      this.cd.markForCheck();
     }
   }