diff --git a/guacamole/src/main/webapp/layouts/en-us-qwerty-mobile.xml b/guacamole/src/main/webapp/layouts/en-us-qwerty-mobile.xml
index 711531bd2..848d55432 100644
--- a/guacamole/src/main/webapp/layouts/en-us-qwerty-mobile.xml
+++ b/guacamole/src/main/webapp/layouts/en-us-qwerty-mobile.xml
@@ -197,7 +197,7 @@
     <row><gap size="0.1"/></row>
 
     <row>
-        <key size="2.1">
+        <key size="2.1" class="shift">
             <cap modifier="shift" keysym="0xFFE1">Shift</cap>
         </key>
         <gap size="0.1"/>
@@ -269,7 +269,7 @@
             <cap if="shift">?</cap>
         </key>
         <gap size="0.1"/>
-        <key size="3.1">
+        <key size="3.1" class="shift">
             <cap modifier="shift" keysym="0xFFE2">Shift</cap>
         </key>
     </row>
diff --git a/guacamole/src/main/webapp/layouts/en-us-qwerty.xml b/guacamole/src/main/webapp/layouts/en-us-qwerty.xml
index 60bf544d1..5e5b48cd1 100644
--- a/guacamole/src/main/webapp/layouts/en-us-qwerty.xml
+++ b/guacamole/src/main/webapp/layouts/en-us-qwerty.xml
@@ -328,7 +328,7 @@
         <row><gap size="0.1"/></row>
 
         <row>
-            <key size="2.1">
+            <key size="2.1" class="shift">
                 <cap modifier="shift" keysym="0xFFE1">Shift</cap>
             </key>
             <gap size="0.1"/>
@@ -396,7 +396,7 @@
                 <cap if="shift">?</cap>
             </key>
             <gap size="0.1"/>
-            <key size="3.1">
+            <key size="3.1" class="shift">
                 <cap modifier="shift" keysym="0xFFE2">Shift</cap>
             </key>
         </row>
diff --git a/guacamole/src/main/webapp/styles/keyboard.css b/guacamole/src/main/webapp/styles/keyboard.css
index 8e9f6a1b0..1e352d017 100644
--- a/guacamole/src/main/webapp/styles/keyboard.css
+++ b/guacamole/src/main/webapp/styles/keyboard.css
@@ -78,16 +78,16 @@
     border-color: #666;
 }
 
+.guac-keyboard.guac-keyboard-modifier-shift .guac-keyboard-key.shift {
+    background: #882;
+    border-color: #DD4;
+}
+
 .guac-keyboard .guac-keyboard-key.guac-keyboard-pressed {
     background: #822;
     border-color: #D44;
 }
 
-.guac-keyboard .guac-keyboard-key.guac-keyboard-active {
-    background: #882;
-    border-color: #DD4;
-}
-
 .guac-keyboard .guac-keyboard-row {
     line-height: 0;
 }