diff --git a/guacamole-common-js/src/main/resources/oskeyboard.js b/guacamole-common-js/src/main/resources/oskeyboard.js
index 2c095fb59..5d3fa0275 100644
--- a/guacamole-common-js/src/main/resources/oskeyboard.js
+++ b/guacamole-common-js/src/main/resources/oskeyboard.js
@@ -241,7 +241,10 @@ Guacamole.OnScreenKeyboard = function(url) {
                     row.appendChild(key_container_element);
 
                     // Set up click handler for key
-                    key_element.onclick = function() {
+                    key_element.onmousedown  =
+                    key_element.ontouchstart = function() {
+
+                        key_element.classList.add("guac-keyboard-pressed");
 
                         // Get current cap based on modifier state
                         var cap = key.getCap(on_screen_keyboard.modifiers);
@@ -270,6 +273,11 @@ Guacamole.OnScreenKeyboard = function(url) {
 
                     };
 
+                    key_element.onmouseup  =
+                    key_element.ontouchend = function() {
+                        key_element.classList.remove("guac-keyboard-pressed");
+                    };
+
                 }
                 
             });