diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js
index 436d9efe3..6a28ac297 100644
--- a/client/app/scripts/actions/app-actions.js
+++ b/client/app/scripts/actions/app-actions.js
@@ -159,7 +159,10 @@ export function hitEsc() {
       type: ActionTypes.CLICK_CLOSE_TERMINAL,
       pipeId: controlPipe.id
     });
+    // Dont deselect node on ESC if there is a controlPipe (keep terminal open)
   } else if (AppStore.getSelectedNodeId() && !controlPipe) {
+    AppDispatcher.dispatch({type: ActionTypes.DESELECT_NODE});
+  }
   updateRoute();
 }
 
diff --git a/client/app/scripts/components/app.js b/client/app/scripts/components/app.js
index 8259325b1..fbad26b07 100644
--- a/client/app/scripts/components/app.js
+++ b/client/app/scripts/components/app.js
@@ -81,7 +81,7 @@ export default class App extends React.Component {
       <div className="app">
         {showingDebugToolbar() && <DebugToolbar />}
         {showingDetails && <Details nodes={this.state.nodes}
-          controlStatus={this.state.controlStatus[this.state.selectedNodeId]}
+          controlStatus={this.state.controlStatus}
           details={this.state.nodeDetails} />}
 
         {showingTerminal && <EmbeddedTerminal
diff --git a/client/app/scripts/components/details.js b/client/app/scripts/components/details.js
index 44c6f2bbe..540b81dd9 100644
--- a/client/app/scripts/components/details.js
+++ b/client/app/scripts/components/details.js
@@ -11,9 +11,9 @@ export default class Details extends React.Component {
       <div className="details">
         {details.map((obj, index) => {
           return (
-            <DetailsCard key={obj.id} controlError={this.props.controlError}
-              controlPending={this.props.controlPending} index={index}
-              cardCount={details.size} nodes={this.props.nodes} {...obj} />
+            <DetailsCard key={obj.id} index={index} cardCount={details.size}
+              nodes={this.props.nodes}
+              nodeControlStatus={this.props.controlStatus[obj.id]} {...obj} />
           );
         })}
       </div>
diff --git a/client/app/scripts/components/node-details.js b/client/app/scripts/components/node-details.js
index a90c33766..1e96f284c 100644
--- a/client/app/scripts/components/node-details.js
+++ b/client/app/scripts/components/node-details.js
@@ -130,7 +130,7 @@ export default class NodeDetails extends React.Component {
     const showSummary = details.metadata !== undefined || details.metrics !== undefined;
     const showControls = details.controls && details.controls.length > 0;
     const nodeColor = getNodeColorDark(details.rank, details.label_major);
-    const {error, pending} = (this.props.controlStatus || {});
+    const {error, pending} = (this.props.nodeControlStatus || {});
     const tools = this.renderTools();
     const styles = {
       controls: {