diff --git a/frontend/src/components/dir-view-mode/dir-column-nav.js b/frontend/src/components/dir-view-mode/dir-column-nav.js
index 845b4df570..82c8e36cb5 100644
--- a/frontend/src/components/dir-view-mode/dir-column-nav.js
+++ b/frontend/src/components/dir-view-mode/dir-column-nav.js
@@ -56,6 +56,9 @@ class DirColumnNav extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
+    if (!nextProps.currentNode) {
+      return;
+    }
     this.setState({opNode: nextProps.currentNode});
   }