diff --git a/inject.js b/inject.js
index 565c95f..9b76702 100644
--- a/inject.js
+++ b/inject.js
@@ -155,11 +155,10 @@ chrome.extension.sendMessage({}, function(response) {
         document.head.appendChild(link);
       }
 
-      document.addEventListener('keypress', function(event) {
-        // if lowercase letter pressed, check for uppercase key code
-        var keyCode = String.fromCharCode(event.keyCode).toUpperCase().charCodeAt();
+      document.addEventListener('keydown', function(event) {
+        var keyCode = event.keyCode;
 
-        // Ignore keypress event if typing in an input box
+        // Ignore keydown event if typing in an input box
         if ((document.activeElement.nodeName === 'INPUT'
               && document.activeElement.getAttribute('type') === 'text')
             || document.activeElement.isContentEditable) {
diff --git a/options.js b/options.js
index c9b9011..d2e70d3 100644
--- a/options.js
+++ b/options.js
@@ -113,7 +113,7 @@ function restore_defaults() {
 function initShortcutInput(inputId) {
   document.getElementById(inputId).addEventListener('focus', inputFocus);
   document.getElementById(inputId).addEventListener('blur', inputBlur);
-  document.getElementById(inputId).addEventListener('keypress', recordKeyPress);
+  document.getElementById(inputId).addEventListener('keydown', recordKeyPress);
 }
 
 document.addEventListener('DOMContentLoaded', function () {