diff --git a/ui-ngx/src/app/shared/components/kv-map.component.ts b/ui-ngx/src/app/shared/components/kv-map.component.ts
index b6f438f428..ee98adf837 100644
--- a/ui-ngx/src/app/shared/components/kv-map.component.ts
+++ b/ui-ngx/src/app/shared/components/kv-map.component.ts
@@ -117,6 +117,11 @@ export class KeyValMapComponent extends PageComponent implements ControlValueAcc
     this.valueChangeSubscription = this.kvListFormGroup.valueChanges.subscribe(() => {
       this.updateModel();
     });
+    if (this.disabled) {
+      this.kvListFormGroup.disable({emitEvent: false});
+    } else {
+      this.kvListFormGroup.enable({emitEvent: false});
+    }
   }
 
   public removeKeyVal(index: number) {