diff --git a/guacamole/src/main/webapp/app/osk/styles/osk.css b/guacamole/src/main/webapp/app/osk/styles/osk.css
index 843442288..b93600d87 100644
--- a/guacamole/src/main/webapp/app/osk/styles/osk.css
+++ b/guacamole/src/main/webapp/app/osk/styles/osk.css
@@ -38,6 +38,7 @@
 
 .guac-keyboard .guac-keyboard-key-container {
     display: inline-block;
+    margin: 0.05em;
 }
 
 .guac-keyboard .guac-keyboard-key {
@@ -132,11 +133,3 @@
 .guac-keyboard .guac-keyboard-group.guac-keyboard-fine {
     text-align: center;
 }
-
-/* Keep function key groups on same line */
-.guac-keyboard .guac-keyboard-group.guac-keyboard-esc,
-.guac-keyboard .guac-keyboard-group.guac-keyboard-f1-f4,
-.guac-keyboard .guac-keyboard-group.guac-keyboard-f5-f8,
-.guac-keyboard .guac-keyboard-group.guac-keyboard-f9-f12 {
-    display: inline-block;
-}