diff --git a/front/core/components/textfield/textfield.js b/front/core/components/textfield/textfield.js
index f47b3de37..88a585eda 100644
--- a/front/core/components/textfield/textfield.js
+++ b/front/core/components/textfield/textfield.js
@@ -18,18 +18,15 @@ export default class Textfield extends Input {
             if (!this.oldValue)
                 this.saveOldValue();
         });
-
         this.input.addEventListener('keyup', e => {
-            if (e.key == 'Escape') {
-                this.value = this.oldValue;
-                this.cancelled = true;
-                e.stopPropagation();
-            }
-            if (e.key == 'Escape' || e.key == 'Enter')
-                this.input.blur();
-        });
+            if (e.defaultPrevented || e.key != 'Escape')
+                return;
 
-        this.input.addEventListener('blur', () => {
+            this.value = this.oldValue;
+            this.cancelled = true;
+            e.preventDefault();
+        });
+        this.input.addEventListener('change', e => {
             if (this.onChange && !this.cancelled && (this.oldValue != this.value)) {
                 this.onChange();
                 this.saveOldValue();