diff --git a/frontend/Node.js b/frontend/Node.js
index f82fff87d2..6b7e0ccec1 100644
--- a/frontend/Node.js
+++ b/frontend/Node.js
@@ -82,6 +82,13 @@ class Node extends React.Component<PropsType, StateType> {
     } else if (!this.props.selected && prevProps.selected) {
       // Losing selection.
       this.unsubscribeFromWindowFocus();
+    } else if (
+      this.props.selected &&
+      this.props.node &&
+      this.props.node.get('collapsed') !== prevProps.node.get('collapsed')
+    ) {
+      // Collapsing/expanding.
+      this.ensureInView();
     }
   }