diff --git a/client/app/scripts/charts/nodes-chart.js b/client/app/scripts/charts/nodes-chart.js
index 2a6d8b674..64380771a 100644
--- a/client/app/scripts/charts/nodes-chart.js
+++ b/client/app/scripts/charts/nodes-chart.js
@@ -50,6 +50,12 @@ const NodesChart = React.createClass({
       });
       this.updateGraphState(nextProps);
     }
+    if (this.props.selectedNodeId !== nextProps.selectedNodeId) {
+      this.restoreLayout();
+    }
+    if (nextProps.selectedNodeId) {
+      this.centerSelectedNode(nextProps);
+    }
   },
 
   componentWillUnmount: function() {
@@ -77,7 +83,8 @@ const NodesChart = React.createClass({
 
   renderGraphNodes: function(nodes, scale) {
     return _.map(nodes, function(node) {
-      const highlighted = _.includes(this.props.highlightedNodeIds, node.id);
+      const highlighted = _.includes(this.props.highlightedNodeIds, node.id)
+        || this.props.selectedNodeId === node.id;
       return (
         <Node
           highlighted={highlighted}
@@ -184,6 +191,73 @@ const NodesChart = React.createClass({
     return edges;
   },
 
+  centerSelectedNode: function(props) {
+    const layoutNodes = this.state.nodes;
+    const layoutEdges = this.state.edges;
+    const selectedLayoutNode = layoutNodes[props.selectedNodeId];
+
+    if (!selectedLayoutNode) {
+      return;
+    }
+
+    const adjacency = props.nodes.get(props.selectedNodeId).get('adjacency');
+    const adjacentLayoutNodes = [];
+
+    adjacency.forEach(function(adjacentId) {
+      adjacentLayoutNodes.push(layoutNodes[adjacentId]);
+    });
+
+    // circle layout for adjacent nodes
+
+    const centerX = selectedLayoutNode.x;
+    const centerY = selectedLayoutNode.y;
+    const radius = Math.min(props.width, props.height) / 3;
+    const adjacentCount = adjacentLayoutNodes.length;
+
+    _.each(adjacentLayoutNodes, function(node, i) {
+      const angle = Math.PI * 2 * i / adjacentCount;
+      node.x = centerX + radius * Math.sin(angle);
+      node.y = centerY + radius * Math.cos(angle);
+    });
+
+    // fix all edges for circular nodes
+
+    _.each(layoutEdges, function(edge) {
+      if (edge.source === selectedLayoutNode
+        || edge.target === selectedLayoutNode
+        || _.includes(adjacentLayoutNodes, edge.source)
+        || _.includes(adjacentLayoutNodes, edge.target)) {
+        edge.points = [
+          {x: edge.source.x, y: edge.source.y},
+          {x: edge.target.x, y: edge.target.y}
+        ];
+      }
+    });
+
+    this.setState({
+      edges: layoutEdges,
+      nodes: layoutNodes
+    });
+  },
+
+  restoreLayout: function() {
+    const edges = this.state.edges;
+    const nodes = this.state.nodes;
+
+    _.each(nodes, function(node) {
+      node.x = node.px;
+      node.y = node.py;
+    });
+
+    _.each(edges, function(edge) {
+      if (edge.ppoints) {
+        edge.points = edge.ppoints;
+      }
+    });
+
+    this.setState({edges: edges, nodes: nodes});
+  },
+
   updateGraphState: function(props) {
     const n = props.nodes.size;
 
@@ -216,6 +290,15 @@ const NodesChart = React.createClass({
       return;
     }
 
+    // save coordinates for restore
+    _.each(nodes, function(node) {
+      node.px = node.x;
+      node.py = node.y;
+    });
+    _.each(edges, function(edge) {
+      edge.ppoints = edge.points;
+    });
+
     // adjust layout based on viewport
     const xFactor = (props.width - MARGINS.left - MARGINS.right) / graph.width;
     const yFactor = props.height / graph.height;
diff --git a/client/app/scripts/components/app.js b/client/app/scripts/components/app.js
index 39d5120f1..6b1cd2aca 100644
--- a/client/app/scripts/components/app.js
+++ b/client/app/scripts/components/app.js
@@ -77,6 +77,7 @@ const App = React.createClass({
 
         <Nodes nodes={this.state.nodes} highlightedNodeIds={this.state.highlightedNodeIds}
           highlightedEdgeIds={this.state.highlightedEdgeIds}
+          selectedNodeId={this.state.selectedNodeId}
           topologyId={this.state.currentTopologyId} />
 
         <div className="footer">
diff --git a/client/app/scripts/components/nodes.js b/client/app/scripts/components/nodes.js
index 9550f55cd..18ba2f2f3 100644
--- a/client/app/scripts/components/nodes.js
+++ b/client/app/scripts/components/nodes.js
@@ -33,12 +33,12 @@ const Nodes = React.createClass({
         <NodesChart
           highlightedEdgeIds={this.props.highlightedEdgeIds}
           highlightedNodeIds={this.props.highlightedNodeIds}
+          selectedNodeId={this.props.selectedNodeId}
           nodes={this.props.nodes}
           onNodeClick={this.onNodeClick}
           width={this.state.width}
           height={this.state.height}
           topologyId={this.props.topologyId}
-          context="view"
         />
       </div>
     );