diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/link-labels.component.html b/ui-ngx/src/app/modules/home/pages/rulechain/link-labels.component.html
index e222b312ab..f757b2e873 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/link-labels.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/link-labels.component.html
@@ -37,7 +37,6 @@
            [matAutocomplete]="labelAutocomplete"
            [matChipInputFor]="chipList"
            [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-           matChipInputAddOnBlur
            (matChipInputTokenEnd)="add($event)">
   </mat-chip-list>
   <mat-autocomplete #labelAutocomplete="matAutocomplete"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
index 3a299d8a9f..44ab2f809a 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
@@ -36,7 +36,6 @@
            [matAutocomplete]="entitySubtypeAutocomplete"
            [matChipInputFor]="chipList"
            [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-           matChipInputAddOnBlur
            (matChipInputTokenEnd)="chipAdd($event)">
   </mat-chip-list>
   <mat-autocomplete #entitySubtypeAutocomplete="matAutocomplete"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts
index 6dffa176cd..8976c9f240 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts
@@ -203,7 +203,7 @@ export class EntitySubTypeListComponent implements ControlValueAccessor, OnInit,
     this.dirty = true;
   }
 
-  add(entitySubtype: string): void {
+  private add(entitySubtype: string): void {
     if (!this.modelValue || this.modelValue.indexOf(entitySubtype) === -1) {
       if (!this.modelValue) {
         this.modelValue = [];
@@ -213,13 +213,12 @@ export class EntitySubTypeListComponent implements ControlValueAccessor, OnInit,
       this.entitySubtypeListFormGroup.get('entitySubtypeList').setValue(this.entitySubtypeList);
     }
     this.propagateChange(this.modelValue);
-    this.clear();
   }
 
   chipAdd(event: MatChipInputEvent): void {
-    const value = event.value;
-    if ((value || '').trim()) {
-      this.add(value.trim());
+    const value = (event.value || '').trim();
+    if (value) {
+      this.add(value);
     }
     this.clear('');
   }
@@ -234,7 +233,6 @@ export class EntitySubTypeListComponent implements ControlValueAccessor, OnInit,
         this.modelValue = null;
       }
       this.propagateChange(this.modelValue);
-      this.clear();
     }
   }