diff --git a/frontend/app/framework/angular/forms/editable-title.component.html b/frontend/app/framework/angular/forms/editable-title.component.html
index cab7959c8..b419d0204 100644
--- a/frontend/app/framework/angular/forms/editable-title.component.html
+++ b/frontend/app/framework/angular/forms/editable-title.component.html
@@ -5,7 +5,7 @@
                 <div class="form-group mr-2">
                     <sqx-control-errors for="name"></sqx-control-errors>
                     
-                    <input type="text" class="form-control form-underlined" formControlName="name" [maxLength]="maxLength" sqxFocusOnInit (keydown)="onKeyDown($event.keyCode)" spellcheck="false">
+                    <input type="text" class="form-control form-underlined" formControlName="name" [maxLength]="maxLength" sqxFocusOnInit (keydown)="onKeyDown($event)" spellcheck="false">
                 </div>
             </div>
             <div class="col-auto">
diff --git a/frontend/app/framework/angular/forms/editable-title.component.ts b/frontend/app/framework/angular/forms/editable-title.component.ts
index c9a2bc0e6..3de5d6768 100644
--- a/frontend/app/framework/angular/forms/editable-title.component.ts
+++ b/frontend/app/framework/angular/forms/editable-title.component.ts
@@ -54,8 +54,8 @@ export class EditableTitleComponent {
     ) {
     }
 
-    public onKeyDown(keyCode: number) {
-        if (keyCode === Keys.ESCAPE) {
+    public onKeyDown(event: KeyboardEvent) {
+        if (Keys.isEscape(event)) {
             this.toggleRename();
         }
     }
diff --git a/frontend/app/shared/components/comments/comment.component.ts b/frontend/app/shared/components/comments/comment.component.ts
index 0ab95f23d..ba2835d7b 100644
--- a/frontend/app/shared/components/comments/comment.component.ts
+++ b/frontend/app/shared/components/comments/comment.component.ts
@@ -85,7 +85,7 @@ export class CommentComponent extends StatefulComponent<State> implements OnChan
     }
 
     public updateWhenEnter(event: KeyboardEvent) {
-        if (event.keyCode === Keys.ENTER && !event.altKey && !event.shiftKey && !event.defaultPrevented) {
+        if (Keys.isEnter(event) && !event.altKey && !event.shiftKey && !event.defaultPrevented) {
             event.preventDefault();
             event.stopImmediatePropagation();
             event.stopPropagation();