diff --git a/client/app/scripts/charts/nodes-chart-edges.js b/client/app/scripts/charts/nodes-chart-edges.js
index b643d79fa..5ee081fa1 100644
--- a/client/app/scripts/charts/nodes-chart-edges.js
+++ b/client/app/scripts/charts/nodes-chart-edges.js
@@ -16,10 +16,13 @@ class NodesChartEdges extends React.Component {
         {layoutEdges.toIndexedSeq().map(edge => {
           const sourceSelected = selectedNodeId === edge.get('source');
           const targetSelected = selectedNodeId === edge.get('target');
-          const blurred = hasSelectedNode && !sourceSelected && !targetSelected
-            || searchQuery && !(searchNodeMatches.has(edge.get('source'))
-              && searchNodeMatches.has(edge.get('target')));
+          const highlighted = highlightedEdgeIds.has(edge.get('id'));
           const focused = hasSelectedNode && (sourceSelected || targetSelected);
+          const blurred = !focused
+            && !highlighted
+            && (!searchQuery
+              || !(searchNodeMatches.has(edge.get('source'))
+              && searchNodeMatches.has(edge.get('target'))));
 
           return (
             <EdgeContainer
@@ -31,7 +34,7 @@ class NodesChartEdges extends React.Component {
               blurred={blurred}
               focused={focused}
               layoutPrecision={layoutPrecision}
-              highlighted={highlightedEdgeIds.has(edge.get('id'))}
+              highlighted={highlighted}
             />
           );
         })}
diff --git a/client/app/scripts/charts/nodes-chart-nodes.js b/client/app/scripts/charts/nodes-chart-nodes.js
index 878e18206..8304aa634 100644
--- a/client/app/scripts/charts/nodes-chart-nodes.js
+++ b/client/app/scripts/charts/nodes-chart-nodes.js
@@ -22,7 +22,8 @@ class NodesChartNodes extends React.Component {
       || (adjacentNodes && adjacentNodes.includes(node.get('id')))));
     const setBlurred = node => node.set('blurred',
       selectedNodeId && !node.get('focused')
-      || searchQuery && !searchNodeMatches.has(node.get('id')));
+      || searchQuery && !searchNodeMatches.has(node.get('id'))
+        && !node.get('highlighted'));
 
     // make sure blurred nodes are in the background
     const sortNodes = node => {