diff --git a/include/base.css b/include/base.css
index 89b2b574..8847789a 100644
--- a/include/base.css
+++ b/include/base.css
@@ -129,6 +129,7 @@ html {
   background-color:#313131;
   border-bottom-right-radius: 800px 600px;
   /*border-top-left-radius: 800px 600px;*/
+  imeMode: disabled;
 }
 
 #noVNC_container, #noVNC_canvas {
diff --git a/include/input.js b/include/input.js
index b996c7d5..49ce6da7 100644
--- a/include/input.js
+++ b/include/input.js
@@ -18,7 +18,7 @@ function Keyboard(defaults) {
 var that           = {},  // Public API methods
     conf           = {},  // Configuration attributes
 
-    keyDownList    = [];         // List of depressed keys 
+    keyDownList    = {};         // List of depressed keys 
                                  // (even if they are happy)
 
 // Configuration attributes
@@ -203,11 +203,14 @@ function getKeysym(evt) {
 }
 
 function show_keyDownList(kind) {
-    var c;
+    var c = 0;
+    var keyCode, fevt;
     var msg = "keyDownList (" + kind + "):\n";
-    for (c = 0; c < keyDownList.length; c++) {
-        msg = msg + "    " + c + " - keyCode: " + keyDownList[c].keyCode +
-              " - which: " + keyDownList[c].which + "\n";
+    for (keyCode in keyDownList) {
+        fevt = getKeyEvent(keyCode, false);
+        msg = msg + "    " + c + " - keyCode: " + fevt.keyCode +
+              " - which: " + fevt.which + "\n";
+        c++;
     }
     Util.Debug(msg);
 }
@@ -225,20 +228,15 @@ function copyKeyEvent(evt) {
 }
 
 function pushKeyEvent(fevt) {
-    keyDownList.push(fevt);
+    keyDownList[fevt.keyCode] = fevt;
 }
 
 function getKeyEvent(keyCode, pop) {
-    var i, fevt = null;
-    for (i = keyDownList.length-1; i >= 0; i--) {
-        if (keyDownList[i].keyCode === keyCode) {
-            if ((typeof(pop) !== "undefined") && (pop)) {
-                fevt = keyDownList.splice(i, 1)[0];
-            } else {
-                fevt = keyDownList[i];
-            }
-            break;
-        }
+    var fevt = keyDownList[keyCode];
+    if (typeof(fevt) === 'undefined') {
+        fevt = null;
+    } else if ((typeof(pop) !== "undefined") && (pop)) {
+        delete keyDownList[keyCode];
     }
     return fevt;
 }
@@ -322,16 +320,11 @@ function onKeyDown(e) {
                    " (onKeyDown key: " + evt.keyCode +
                    ", which: " + evt.which + ")");
             conf.onKeyPress(keysym, 1, evt);
+            pushKeyEvent(fevt);
         }
         suppress = true;
     }
 
-    if (! ignoreKeyEvent(evt)) {
-        // Add it to the list of depressed keys
-        pushKeyEvent(fevt);
-        //show_keyDownList('down');
-    }
-
     if (suppress) {
         // Suppress bubbling/default actions
         Util.stopEvent(e);
@@ -365,15 +358,6 @@ function onKeyPress(e) {
 
     keysym = getKeysym(evt);
 
-    // Modify the the which attribute in the depressed keys list so
-    // that the keyUp event will be able to have the character code
-    // translation available.
-    if (kdlen > 0) {
-        keyDownList[kdlen-1].keysym = keysym;
-    } else {
-        Util.Warn("keyDownList empty when keyPress triggered");
-    }
-
     //show_keyDownList('press');
     
     // Send the translated keysym
@@ -381,7 +365,7 @@ function onKeyPress(e) {
         Util.Debug("onKeyPress down, keysym: " + keysym +
                    " (onKeyPress key: " + evt.keyCode +
                    ", which: " + evt.which + ")");
-        conf.onKeyPress(keysym, 1, evt);
+        conf.onKeyPress(keysym, 2, evt);
     }
 
     // Stop keypress events just in case
@@ -422,12 +406,9 @@ function onKeyUp(e) {
 
 function allKeysUp() {
     Util.Debug(">> Keyboard.allKeysUp");
-    if (keyDownList.length > 0) {
-        Util.Info("Releasing pressed/down keys");
-    }
-    var i, keysym, fevt = null;
-    for (i = keyDownList.length-1; i >= 0; i--) {
-        fevt = keyDownList.splice(i, 1)[0];
+    var keyCode, keysym, fevt;
+    for (keyCode in keyDownList) {
+        fevt = getKeyEvent(keyCode, true);
         keysym = fevt.keysym;
         if (conf.onKeyPress && (keysym > 0)) {
             Util.Debug("allKeysUp, keysym: " + keysym +
diff --git a/include/rfb.js b/include/rfb.js
index b7be99f8..e622ca3a 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -601,7 +601,17 @@ keyPress = function(keysym, down) {
 
     if (conf.view_only) { return; } // View only, skip keyboard events
 
-    arr = keyEvent(keysym, down);
+    if (down === 2) {
+        // keypress event
+        // Send a keyup event here to avoid letting the server side generate
+        // repeated-key events. Otherwise, both sides will independently
+        // generate key down and press events against the same key.
+        arr = keyEvent(keysym, 1);
+        arr = arr.concat(keyEvent(keysym, 0));
+    } else {
+        // keydown or keyup event
+        arr = keyEvent(keysym, down);
+    }
     arr = arr.concat(fbUpdateRequests());
     ws.send(arr);
 };