diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js
index a1d5a2f1c..9da0b87c1 100644
--- a/app/assets/javascripts/app/controllers/editor.js
+++ b/app/assets/javascripts/app/controllers/editor.js
@@ -803,10 +803,14 @@ angular.module('app')
     this.altKeyObserver = keyboardManager.addKeyObserver({
       modifiers: [KeyboardManager.KeyModifierAlt],
       onKeyDown: () => {
-        this.altKeyDown = true;
+        $timeout(() => {
+          this.altKeyDown = true;
+        })
       },
       onKeyUp: () => {
-        this.altKeyDown = false;
+        $timeout(() => {
+          this.altKeyDown = false;
+        });
       }
     })
 
@@ -815,7 +819,9 @@ angular.module('app')
       notElementIds: ["note-text-editor", "note-title-editor"],
       modifiers: [KeyboardManager.KeyModifierMeta],
       onKeyDown: () => {
-        this.deleteNote();
+        $timeout(() => {
+          this.deleteNote();
+        });
       },
     })
 
@@ -868,8 +874,10 @@ angular.module('app')
             editor.selectionStart = editor.selectionEnd = start + 4;
           }
 
-          this.note.text = editor.value;
-          this.changesMade({bypassDebouncer: true});
+          $timeout(() => {
+            this.note.text = editor.value;
+            this.changesMade({bypassDebouncer: true});
+          })
         },
       })
 
diff --git a/app/assets/javascripts/app/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js
index 00d5989bf..899b3e2a1 100644
--- a/app/assets/javascripts/app/controllers/notes.js
+++ b/app/assets/javascripts/app/controllers/notes.js
@@ -573,7 +573,9 @@ angular.module('app')
       modifiers: [KeyboardManager.KeyModifierMeta, KeyboardManager.KeyModifierCtrl],
       onKeyDown: (event) => {
         event.preventDefault();
-        this.createNewNote();
+        $timeout(() => {
+          this.createNewNote();
+        });
       }
     })
 
diff --git a/app/assets/javascripts/app/services/keyboardManager.js b/app/assets/javascripts/app/services/keyboardManager.js
index 01a9549e0..d50736dd9 100644
--- a/app/assets/javascripts/app/services/keyboardManager.js
+++ b/app/assets/javascripts/app/services/keyboardManager.js
@@ -1,10 +1,8 @@
 class KeyboardManager {
 
-  constructor($timeout) {
+  constructor() {
     this.observers = [];
 
-    this.$timeout = $timeout;
-
     KeyboardManager.KeyTab = "Tab";
     KeyboardManager.KeyBackspace = "Backspace";
 
@@ -64,9 +62,7 @@ class KeyboardManager {
       if(this.eventMatchesKeyAndModifiers(event, observer.key, observer.modifiers)) {
         let callback = keyEventType == KeyboardManager.KeyEventDown ? observer.onKeyDown : observer.onKeyUp;
         if(callback) {
-          this.$timeout(() => {
-            callback(event);
-          })
+          callback(event);
         }
       }
     }