diff --git a/apple2js.html b/apple2js.html
index 536cf6c..4e26b16 100644
--- a/apple2js.html
+++ b/apple2js.html
@@ -680,6 +680,10 @@ function _keydown(evt) {
                 elem.mozRequestFullScreen();
             }
         }
+    } else if (evt.keyCode == 16) { // Shift
+        keyboard.shiftKey(true);
+    } else if (evt.keyCode == 17) { // Control
+        keyboard.controlKey(true);
     } else if (!focused && (!evt.metaKey || evt.ctrlKey)) {
         evt.preventDefault();
         
@@ -695,8 +699,15 @@ function _keydown(evt) {
 function _keyup(evt) {
     _key = 0xff;
 
-    if (!focused) 
-        io.keyUp();
+    if (evt.keyCode == 16) { // Shift
+        keyboard.shiftKey(false);
+    } else if (evt.keyCode == 17) { // Control
+        keyboard.controlKey(false);
+    } else {
+        if (!focused) {
+            io.keyUp();
+        }
+    }
 }
 
 function updateScreen() {