diff --git a/src/app/keymap.coffee b/src/app/keymap.coffee
index 0b38958b8..50404d037 100644
--- a/src/app/keymap.coffee
+++ b/src/app/keymap.coffee
@@ -150,7 +150,7 @@ class Keymap
     if event.originalEvent.keyIdentifier.indexOf('U+') == 0
       hexCharCode = event.originalEvent.keyIdentifier[2..]
       charCode = parseInt(hexCharCode, 16)
-      charCode = Math.min(event.which, charCode) if event.which?
+      charCode = event.which if !@isAscii(charCode) and @isAscii(event.which)
       key = @keyFromCharCode(charCode)
     else
       key = event.originalEvent.keyIdentifier.toLowerCase()
@@ -171,6 +171,9 @@ class Keymap
 
     [modifiers..., key].join('-')
 
+  isAscii: (charCode) ->
+    0 <= charCode <= 127
+
   keyFromCharCode: (charCode) ->
     switch charCode
       when 8 then 'backspace'