diff --git a/web/app/sketcher/input-manager.js b/web/app/sketcher/input-manager.js
index c2f2452e..49dfb6ab 100644
--- a/web/app/sketcher/input-manager.js
+++ b/web/app/sketcher/input-manager.js
@@ -1,27 +1,11 @@
 import {keymap} from './keymaps/default'
-import {jwerty} from 'jwerty'
+import Mousetrap from 'mousetrap';
 
 export function InputManager(app) {
   this.app = app;
   this.keymap = keymap;
-  $(() => {
-    $(document)
-      .on('keydown', (e) => this.handleKeyPress(e))
-  });
+  
+  for (let action of Object.keys(keymap)) {
+    Mousetrap.bind(keymap[action], e => this.app.actions[action].action(e));
+  }
 }
-
-InputManager.prototype.handleKeyPress = function(e) {
-  switch (e.keyCode) {
-    //case 27 : this.clear(); break;
-  }
-
-  for (let action in this.keymap) {
-    if (jwerty.is(this.keymap[action], e)) {
-      setTimeout(() => this.app.actions[action].action(e), 0);
-      e.stopPropagation();
-      e.preventDefault();
-      break;
-    }
-  }
-};
-
diff --git a/web/app/sketcher/keymaps/default.js b/web/app/sketcher/keymaps/default.js
index b9ef8819..ea07e62b 100644
--- a/web/app/sketcher/keymaps/default.js
+++ b/web/app/sketcher/keymaps/default.js
@@ -1,7 +1,7 @@
 export const keymap = {
-  'save': 'ctrl+S',
-  'open': 'ctrl+O',
-  'new' : 'ctrl+N',
+  'save': 'ctrl+s',
+  'open': 'ctrl+o',
+  'new' : 'ctrl+n',
   'terminal': '`',
   'info': 'F1'
 };