diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index ae0df245f..e4cb17b79 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -61,11 +61,11 @@
             <!-- Menu trigger -->
             <div id="menuControl"></div>
 
-            <!-- On-screen keyboard -->
-            <div id="keyboardContainer"></div>
-
         </div>
 
+        <!-- On-screen keyboard -->
+        <div id="keyboardContainer"></div>
+
         <!-- Error Dialog-->
         <div id="errorDialog" class="errorDialogOuter">
             <div class="errorDialogMiddle">