--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -568,24 +568,22 @@ let UI = {
     let box = document.querySelector("#runtime-actions");
 
     let runtimePanelButton = document.querySelector("#runtime-panel-button");
     if (AppManager.connection.status == Connection.Status.CONNECTED) {
       screenshotCmd.removeAttribute("disabled");
       permissionsCmd.removeAttribute("disabled");
       disconnectCmd.removeAttribute("disabled");
       detailsCmd.removeAttribute("disabled");
-      box.removeAttribute("hidden");
       runtimePanelButton.setAttribute("active", "true");
     } else {
       screenshotCmd.setAttribute("disabled", "true");
       permissionsCmd.setAttribute("disabled", "true");
       disconnectCmd.setAttribute("disabled", "true");
       detailsCmd.setAttribute("disabled", "true");
-      box.setAttribute("hidden", "true");
       runtimePanelButton.removeAttribute("active");
     }
 
   },
 
   /********** TOOLBOX **********/
 
   onMessage: function(event) {

--- a/browser/devtools/webide/content/webide.xul
+++ b/browser/devtools/webide/content/webide.xul
@@ -149,20 +149,21 @@
         <vbox id="runtime-panel-usbruntime"></vbox>
         <label class="panel-header" id="runtime-header-wifi-devices">&runtimePanel_WiFiDevices;</label>
         <vbox id="runtime-panel-wifi-devices"></vbox>
         <label class="panel-header">&runtimePanel_simulators;</label>
         <toolbarbutton class="panel-item" label="&runtimePanel_nosimulator;" id="runtime-panel-nosimulator" command="cmd_showAddons"/>
         <vbox id="runtime-panel-simulators"></vbox>
         <label class="panel-header">&runtimePanel_custom;</label>
         <vbox id="runtime-panel-custom"></vbox>
-        <vbox flex="1" id="runtime-actions" hidden="true">
+        <vbox flex="1" id="runtime-actions">
           <toolbarbutton class="panel-item" id="runtime-details" command="cmd_showRuntimeDetails"/>
           <toolbarbutton class="panel-item" id="runtime-permissions" command="cmd_showPermissionsTable"/>
           <toolbarbutton class="panel-item" id="runtime-screenshot"  command="cmd_takeScreenshot"/>
+          <toolbarbutton class="panel-item" id="runtime-disconnect"  command="cmd_disconnectRuntime"/>
         </vbox>
       </vbox>
     </panel>
 
   </popupset>
 
   <notificationbox flex="1" id="notificationbox">
     <deck flex="1" id="deck" selectedIndex="-1">

--- a/browser/devtools/webide/themes/webide.css
+++ b/browser/devtools/webide/themes/webide.css
@@ -196,31 +196,33 @@ panel > .panel-arrowcontainer > .panel-a
   padding: 12px 0 0;
 }
 
 #runtime-panel-custom {
   margin-bottom: 12px;
 }
 
 #runtime-details,
+#runtime-screenshot,
 #runtime-permissions,
-#runtime-screenshot,
+#runtime-disconnect,
 #runtime-panel-nousbdevice,
 #runtime-panel-noadbhelper,
 #runtime-panel-nosimulator,
 .runtime-panel-item-usb,
 .runtime-panel-item-wifi,
 .runtime-panel-item-custom,
 .runtime-panel-item-simulator {
   list-style-image: url("icons.png");
 }
 
 #runtime-details                { -moz-image-region: rect(156px,338px,182px,312px) }
 #runtime-screenshot             { -moz-image-region: rect(130px,338px,156px,312px) }
 #runtime-permissions            { -moz-image-region: rect(104px,338px,130px,312px) }
+#runtime-disconnect             { -moz-image-region: rect(52px,338px,78px,312px) }
 #runtime-panel-nousbdevice      { -moz-image-region: rect(156px,338px,182px,312px) }
 #runtime-panel-noadbhelper      { -moz-image-region: rect(234px,338px,260px,312px) }
 #runtime-panel-nosimulator      { -moz-image-region: rect(0px,338px,26px,312px) }
 .runtime-panel-item-usb         { -moz-image-region: rect(52px,338px,78px,312px) }
 .runtime-panel-item-wifi        { -moz-image-region: rect(208px,338px,234px,312px) }
 .runtime-panel-item-custom      { -moz-image-region: rect(26px,338px,52px,312px) }
 .runtime-panel-item-simulator   { -moz-image-region: rect(0px,338px,26px,312px) }
 
@@ -232,17 +234,21 @@ panel > .panel-arrowcontainer > .panel-a
 #runtime-actions > toolbarbutton {
   border-top: 1px solid rgba(221,221,221,1);
   background-color: rgba(233,233,233,1);
   color: rgba(87,87,87,1);
   padding-top: 8px;
   padding-bottom: 8px;
 }
 
-#runtime-actions > toolbarbutton:hover {
+#runtime-actions > toolbarbutton[disabled="true"] {
+  opacity: 0.4;
+}
+
+#runtime-actions > toolbarbutton:not([disabled="true"]):hover {
   background-color: #CBF0FE;
 }
 
 #runtime-actions > toolbarbutton:last-child {
   border-radius: 0 0 3px 3px;
 }
 
 /* Main view */