diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 2466df1fde..4b294d530a 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -989,6 +989,10 @@ public class Functions {
             || (href.equals(".") && url.endsWith("."));
     }
 
+    public <T> List<T> singletonList(T t) {
+        return Collections.singletonList(t);
+    }
+
     /**
      * Gets all the {@link PageDecorator}s.
      */
diff --git a/core/src/main/resources/hudson/model/Computer/ajaxExecutors.jelly b/core/src/main/resources/hudson/model/Computer/ajaxExecutors.jelly
new file mode 100644
index 0000000000..0e70f33942
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Computer/ajaxExecutors.jelly
@@ -0,0 +1,8 @@
+<!--
+  Used to asynchronously update executor queue
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
+  <l:ajax>
+    <t:executors computers="${h.singletonList(it)}" />
+  </l:ajax>
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
index d77c8622d5..534b55567e 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
@@ -14,5 +14,6 @@
       <l:task icon="images/24x24/terminal.gif" href="script" title="${%Script Console}" permission="${app.ADMINISTER}" />
       <st:include page="sidepanel2.jelly" optional="true" /><!-- hook for derived class to add more items -->
     </l:tasks>
+    <t:executors computers="${h.singletonList(it)}" />
   </l:side-panel>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index f0036190fc..f7c5ff601c 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -1,16 +1,21 @@
-<!--
-    displays the status of executors.
--->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <st:documentation>
+    Displays the status of executors.
+    <st:attribute name="computers">
+      If specified, this is the list of computers whose executors are rendered. If omitted, all the computers
+      in the system will be rendered.
+    </st:attribute>
+  </st:documentation>
+  <j:set var="computers" value="${h.ifThenElse(attrs.computers!=null, attrs.computers, app.computers)}" />
 	<l:pane title="&lt;a href='${rootURL}/computer/'>${%Build Executor Status}&lt;/a>" width="3" id="executors">
-	  <j:forEach var="c" items="${app.computers}" varStatus="cloop">
+	  <j:forEach var="c" items="${computers}" varStatus="cloop">
 	    <j:choose>
-	      <j:when test="${c.node==app}">
+	      <j:when test="${c.node==app or computers.size()==1}">
 	        <tr>
 	          <th class="pane">No.</th>
 	          <th class="pane">
               <j:choose>
-                <j:when test="${empty(app.slaves)}">
+                <j:when test="${empty(app.slaves) or computers.size()==1}">
                   ${%Status}
                 </j:when>
                 <j:otherwise>