diff --git a/desktop/src/app/components/docedit/core/forms/identifier.component.ts b/desktop/src/app/components/docedit/core/forms/identifier.component.ts
index 7dbe3ea6f9..23144ffa4a 100644
--- a/desktop/src/app/components/docedit/core/forms/identifier.component.ts
+++ b/desktop/src/app/components/docedit/core/forms/identifier.component.ts
@@ -29,14 +29,14 @@ export class IdentifierComponent implements OnChanges {
     }
 
 
-    public update(value: string) {
+    public update() {
 
-        if (value === '') {
+        if (this.identifierBody === '') {
             delete this.fieldContainer[this.fieldName];
         } else {
             this.fieldContainer[this.fieldName] = this.identifierPrefix
-                ? this.identifierPrefix + value
-                : value;
+                ? this.identifierPrefix + this.identifierBody
+                : this.identifierBody;
         }
     }
 
diff --git a/desktop/src/app/components/docedit/core/forms/identifier.html b/desktop/src/app/components/docedit/core/forms/identifier.html
index b6c9589f84..95d74e14e3 100644
--- a/desktop/src/app/components/docedit/core/forms/identifier.html
+++ b/desktop/src/app/components/docedit/core/forms/identifier.html
@@ -5,7 +5,7 @@
           [class.focused]="focused">{{identifierPrefix}}</span>
     <input #inputField
            [(ngModel)]="identifierBody"
-           (keyup)="update($event.target.value)"
+           (input)="update()"
            (focus)="focused = true"
            (blur)="focused = false"
            class="form-control"
diff --git a/desktop/src/app/components/docedit/core/forms/simple-input.component.ts b/desktop/src/app/components/docedit/core/forms/simple-input.component.ts
index 586824dc33..df75afd301 100644
--- a/desktop/src/app/components/docedit/core/forms/simple-input.component.ts
+++ b/desktop/src/app/components/docedit/core/forms/simple-input.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 
 @Component({
     selector: 'form-field-simple-input',
-    template: `<input [(ngModel)]="fieldContainer[fieldName]" (keyup)="deleteIfEmpty($event.target.value)"
+    template: `<input [(ngModel)]="fieldContainer[fieldName]" (input)="deleteIfEmpty()"
                       class="form-control">`
 })
 
@@ -18,8 +18,8 @@ export class SimpleInputComponent {
     @Input() fieldName: string;
 
 
-    public deleteIfEmpty(value: string) {
+    public deleteIfEmpty() {
 
-        if (value === '') delete this.fieldContainer[this.fieldName];
+        if (this.fieldContainer[this.fieldName] === '') delete this.fieldContainer[this.fieldName];
     }
 }
diff --git a/desktop/src/app/components/docedit/core/forms/widgets/multi-language-text-field.html b/desktop/src/app/components/docedit/core/forms/widgets/multi-language-text-field.html
index e7ca2f118f..bdf59bccc7 100644
--- a/desktop/src/app/components/docedit/core/forms/widgets/multi-language-text-field.html
+++ b/desktop/src/app/components/docedit/core/forms/widgets/multi-language-text-field.html
@@ -30,14 +30,14 @@
     <input *ngIf="!multiLine" #inputField [(ngModel)]="selectedText"
         [class.focused]="focused"
         [class.with-tabs]="hasTabs()"
-        (keyup)="onChanges($event.target.value)"
+        (input)="onChanges($event.target.value)"
         (focus)="focused = true"
         (blur)="onBlur()"
         class="form-control">
     <textarea *ngIf="multiLine" #inputField [(ngModel)]="selectedText"
         [class.focused]="focused"
         [class.with-tabs]="hasTabs()"
-        (keyup)="onChanges($event.target.value)"
+        (input)="onChanges($event.target.value)"
         (focus)="focused = true"
         (blur)="onBlur()"
         class="form-control"></textarea>