diff --git a/frontend/scenes/Document/Document.js b/frontend/scenes/Document/Document.js
index 4a2a077f4..a1866aa1e 100644
--- a/frontend/scenes/Document/Document.js
+++ b/frontend/scenes/Document/Document.js
@@ -93,7 +93,7 @@ type Props = {
       });
       this.newDocument = newDocument;
     } else {
-      let document = this.document;
+      let document = this.getDocument(props.match.params.documentSlug);
       if (document) {
         this.props.ui.setActiveDocument(document);
       }
@@ -124,13 +124,17 @@ type Props = {
     );
   }
 
-  get document() {
+  getDocument(documentSlug: ?string) {
     if (this.newDocument) return this.newDocument;
     return this.props.documents.getByUrl(
-      `/doc/${this.props.match.params.documentSlug}`
+      `/doc/${documentSlug || this.props.match.params.documentSlug}`
     );
   }
 
+  get document() {
+    return this.getDocument();
+  }
+
   onClickEdit = () => {
     if (!this.document) return;
     const url = `${this.document.url}/edit`;