diff --git a/frontend/scenes/DocumentScene/DocumentScene.js b/frontend/scenes/DocumentScene/DocumentScene.js
index 851082f28..31ebecc0a 100644
--- a/frontend/scenes/DocumentScene/DocumentScene.js
+++ b/frontend/scenes/DocumentScene/DocumentScene.js
@@ -150,7 +150,9 @@ class DocumentScene extends React.Component {
     const { sidebar } = this.props.ui;
 
     const doc = this.store.document;
-    if (!doc) return;
+
+    // FIXME: feels ghetto
+    if (!doc) return <div />;
     const allowDelete =
       doc &&
       doc.collection.type === 'atlas' &&
diff --git a/frontend/scenes/DocumentScene/DocumentSceneStore.js b/frontend/scenes/DocumentScene/DocumentSceneStore.js
index fe07d6622..d1d6ff64e 100644
--- a/frontend/scenes/DocumentScene/DocumentSceneStore.js
+++ b/frontend/scenes/DocumentScene/DocumentSceneStore.js
@@ -36,23 +36,22 @@ class DocumentSceneStore {
 
   @computed get collectionTree(): ?Object {
     if (
-      !this.document ||
-      this.document.collection ||
-      this.document.collection.type !== 'atlas'
-    )
-      return;
-    const tree = this.document.collection.navigationTree;
+      this.document &&
+      this.document.collection &&
+      this.document.collection.type === 'atlas'
+    ) {
+      const tree = this.document.collection.navigationTree;
+      const collapseNodes = node => {
+        node.collapsed = this.collapsedNodes.includes(node.id);
+        node.children = node.children.map(childNode => {
+          return collapseNodes(childNode);
+        });
 
-    const collapseNodes = node => {
-      node.collapsed = this.collapsedNodes.includes(node.id);
-      node.children = node.children.map(childNode => {
-        return collapseNodes(childNode);
-      });
+        return node;
+      };
 
-      return node;
-    };
-
-    return collapseNodes(toJS(tree));
+      return collapseNodes(toJS(tree));
+    }
   }
 
   /* Actions */