diff --git a/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.html b/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.html
index c38ed96f4..b6cb89933 100644
--- a/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.html
+++ b/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.html
@@ -23,6 +23,7 @@
                         nz-input
                         [formControl]="controls[i]"
                         (keyup)="onChange(config)"
+                        (keyup.enter)="onAddClick()"
                 />
                 <textarea
                         *ngIf="config.type === 'textarea'"
@@ -39,6 +40,7 @@
                     nzSize="small"
                     nzType="primary"
                     nzShape="circle"
+                    type="button"
                     (click)="onAddClick()"
                     *ngIf="i === 0 && config.multipleValues"
                     title="Add field"
@@ -50,6 +52,7 @@
                     nzDanger="true"
                     nzShape="circle"
                     nzSize="small"
+                    type="button"
                     *ngIf="controls.length > 1"
                     (click)="onRemoveFieldClick(controls[i], config)"
                     title="Remove field"
diff --git a/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.ts b/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.ts
index db17d86e1..7c93861aa 100644
--- a/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.ts
+++ b/flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.ts
@@ -44,9 +44,11 @@ export class MultiInputComponent implements OnInit {
   }
 
   onAddClick() {
-    this.controls.push(
-      new FormControl('')
-    );
+    if (this.config.multipleValues==true) {
+      this.controls.push(
+          new FormControl('')
+      );
+    }
   }
 
   onChange(config: CustomFormConfig) {