diff --git a/app/components/DropToImport.js b/app/components/DropToImport.js
index 2d669346..3be91370 100644
--- a/app/components/DropToImport.js
+++ b/app/components/DropToImport.js
@@ -77,7 +77,7 @@ class DropToImport extends React.Component<Props> {
       ...rest
     } = this.props;
 
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
     if (this.props.disabled) return this.props.children;
 
     return (
diff --git a/app/components/Editor/Editor.js b/app/components/Editor/Editor.js
index 2abba0e1..eda2a9d3 100644
--- a/app/components/Editor/Editor.js
+++ b/app/components/Editor/Editor.js
@@ -74,7 +74,7 @@ class Editor extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     return (
       <RichMarkdownEditor
diff --git a/app/components/Layout.js b/app/components/Layout.js
index c5af87ee..5f266bd9 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -81,7 +81,7 @@ class Layout extends React.Component<Props> {
     const showSidebar = auth.authenticated && user && team;
 
     if (auth.isSuspended) return <ErrorSuspended />;
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     return (
       <Container column auto>
diff --git a/app/menus/AccountMenu.js b/app/menus/AccountMenu.js
index ad3cda0b..257bad6a 100644
--- a/app/menus/AccountMenu.js
+++ b/app/menus/AccountMenu.js
@@ -41,7 +41,7 @@ class AccountMenu extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     return (
       <DropdownMenu
diff --git a/app/menus/CollectionMenu.js b/app/menus/CollectionMenu.js
index 86d8e7a5..c586b343 100644
--- a/app/menus/CollectionMenu.js
+++ b/app/menus/CollectionMenu.js
@@ -90,7 +90,7 @@ class CollectionMenu extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     const { collection, label, onOpen, onClose } = this.props;
 
diff --git a/app/menus/DocumentMenu.js b/app/menus/DocumentMenu.js
index ea66b020..92f92c8b 100644
--- a/app/menus/DocumentMenu.js
+++ b/app/menus/DocumentMenu.js
@@ -82,7 +82,7 @@ class DocumentMenu extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     const { document, label, className, showPrint, auth } = this.props;
     const canShareDocuments = auth.team && auth.team.sharing;
diff --git a/app/menus/NewChildDocumentMenu.js b/app/menus/NewChildDocumentMenu.js
index f7ca9e1f..f0966d51 100644
--- a/app/menus/NewChildDocumentMenu.js
+++ b/app/menus/NewChildDocumentMenu.js
@@ -34,7 +34,7 @@ class NewChildDocumentMenu extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     const { label, document, ...rest } = this.props;
     const { collection } = document;
diff --git a/app/menus/NewDocumentMenu.js b/app/menus/NewDocumentMenu.js
index d39a3e50..7ccd909d 100644
--- a/app/menus/NewDocumentMenu.js
+++ b/app/menus/NewDocumentMenu.js
@@ -35,7 +35,7 @@ class NewDocumentMenu extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     const { collections, label, ...rest } = this.props;
 
diff --git a/app/menus/ShareMenu.js b/app/menus/ShareMenu.js
index fb78e761..d73624c4 100644
--- a/app/menus/ShareMenu.js
+++ b/app/menus/ShareMenu.js
@@ -44,7 +44,7 @@ class ShareMenu extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     const { share, label, onOpen, onClose } = this.props;
 
diff --git a/app/scenes/Collection.js b/app/scenes/Collection.js
index 9bd7eb00..f8ac6958 100644
--- a/app/scenes/Collection.js
+++ b/app/scenes/Collection.js
@@ -117,7 +117,7 @@ class CollectionScene extends React.Component<Props> {
   render() {
     const { documents } = this.props;
 
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
     if (!this.isFetching && !this.collection) return <Search notFound />;
 
     const pinnedDocuments = this.collection
diff --git a/app/scenes/Document/components/Header.js b/app/scenes/Document/components/Header.js
index 8996012d..54c78847 100644
--- a/app/scenes/Document/components/Header.js
+++ b/app/scenes/Document/components/Header.js
@@ -87,7 +87,7 @@ class Header extends React.Component<Props> {
   };
 
   render() {
-    if (this.redirectTo) return <Redirect to={this.redirectTo} />;
+    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
 
     const {
       document,