diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
index 249e084fe..1835740c6 100644
--- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js
+++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -938,6 +938,8 @@ Guacamole.Keyboard = function(element) {
                 guac_keyboard.release(keysym);
                 first.defaultPrevented = true;
             }
+            else
+                guac_keyboard.reset();
 
             return eventLog.shift();