diff --git a/include/base.css b/include/base.css
index 228032ba..a2aa5935 100644
--- a/include/base.css
+++ b/include/base.css
@@ -52,12 +52,19 @@ html {
   float:right;
 }
 
+#noVNC_buttons {
+  white-space: nowrap;
+}
+
 #noVNC_view_drag_button {
   display: none;
 }
 #sendCtrlAltDelButton {
   display: none;
 }
+#noVNC_xvp_buttons {
+  display: none;
+}
 #noVNC_mobile_buttons {
   display: none;
 }
diff --git a/vnc_auto.html b/vnc_auto.html
index 5f393769..bb0ce51c 100644
--- a/vnc_auto.html
+++ b/vnc_auto.html
@@ -50,10 +50,10 @@
                     <td><div id="noVNC_status" style="position: relative; height: auto;">
                         Loading
                     </div></td>
-                    <td width="1%"><div id="noVNC_buttons" style="white-space: nowrap">
+                    <td width="1%"><div id="noVNC_buttons">
                         <input type=button value="Send CtrlAltDel"
                             id="sendCtrlAltDelButton">
-                        <span id="xvp_buttons" style="display: none">
+                        <span id="noVNC_xvp_buttons">
                         <input type=button value="Shutdown"
                             id="xvpShutdownButton">
                         <input type=button value="Reboot"
@@ -139,7 +139,7 @@
 
         function xvpInit(ver) {
             var xvpbuttons;
-            xvpbuttons = $D('xvp_buttons');
+            xvpbuttons = $D('noVNC_xvp_buttons');
             if (ver >= 1) {
                 xvpbuttons.style.display = 'inline';
             } else {