diff --git a/app/ui.js b/app/ui.js
index 33e0e997..4b34e243 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -84,6 +84,7 @@ var UI;
             UI.setupFullscreen();
             UI.addControlbarHandlers();
             UI.addTouchSpecificHandlers();
+            UI.addExtraKeysHandlers();
             UI.addXvpHandlers();
             UI.addConnectionControlHandlers();
             UI.addClipboardHandlers();
@@ -218,7 +219,9 @@ var UI;
                 .addEventListener('submit', function () { return false; });
 
             window.addEventListener('load', UI.keyboardinputReset);
+        },
 
+        addExtraKeysHandlers: function() {
             document.getElementById("noVNC_toggle_extra_keys_button")
                 .addEventListener('click', UI.toggleExtraKeys);
             document.getElementById("noVNC_toggle_ctrl_button")
diff --git a/vnc.html b/vnc.html
index f20b00c3..8676e83d 100644
--- a/vnc.html
+++ b/vnc.html
@@ -72,19 +72,21 @@
                 <input type="image" alt="Keyboard" src="app/images/keyboard.svg"
                     id="noVNC_keyboard_button" class="noVNC_button"
                     value="Keyboard" title="Show Keyboard" />
-                <div id="noVNC_extra_keys">
-                    <input type="image" alt="Extra keys" src="app/images/toggleextrakeys.svg"
-                        id="noVNC_toggle_extra_keys_button" class="noVNC_button" />
-                    <div id="noVNC_modifiers">
-                        <input type="image" alt="Ctrl" src="app/images/ctrl.svg"
-                            id="noVNC_toggle_ctrl_button" class="noVNC_button" />
-                        <input type="image" alt="Alt" src="app/images/alt.svg"
-                            id="noVNC_toggle_alt_button" class="noVNC_button" />
-                        <input type="image" alt="Tab" src="app/images/tab.svg"
-                            id="noVNC_send_tab_button" class="noVNC_button" />
-                        <input type="image" alt="Esc" src="app/images/esc.svg"
-                            id="noVNC_send_esc_button" class="noVNC_button" />
-                    </div>
+            </div>
+
+            <!-- Extra manual keys -->
+            <div id="noVNC_extra_keys">
+                <input type="image" alt="Extra keys" src="app/images/toggleextrakeys.svg"
+                    id="noVNC_toggle_extra_keys_button" class="noVNC_button" />
+                <div id="noVNC_modifiers">
+                    <input type="image" alt="Ctrl" src="app/images/ctrl.svg"
+                        id="noVNC_toggle_ctrl_button" class="noVNC_button" />
+                    <input type="image" alt="Alt" src="app/images/alt.svg"
+                        id="noVNC_toggle_alt_button" class="noVNC_button" />
+                    <input type="image" alt="Tab" src="app/images/tab.svg"
+                        id="noVNC_send_tab_button" class="noVNC_button" />
+                    <input type="image" alt="Esc" src="app/images/esc.svg"
+                        id="noVNC_send_esc_button" class="noVNC_button" />
                 </div>
             </div>