diff --git a/app/scenes/CollectionEdit/CollectionEdit.js b/app/scenes/CollectionEdit/CollectionEdit.js
index 6a7d1c156..b86126912 100644
--- a/app/scenes/CollectionEdit/CollectionEdit.js
+++ b/app/scenes/CollectionEdit/CollectionEdit.js
@@ -54,7 +54,7 @@ class CollectionEdit extends Component {
       <Flex column>
         <form onSubmit={this.handleSubmit}>
           <HelpText>
-            You can edit a collection's name at any time, however doing so might
+            You can edit a collection’s name at any time, however doing so might
             confuse your team mates.
           </HelpText>
           <Input
diff --git a/app/scenes/Document/Document.js b/app/scenes/Document/Document.js
index e24a25df6..a95340d23 100644
--- a/app/scenes/Document/Document.js
+++ b/app/scenes/Document/Document.js
@@ -164,10 +164,9 @@ class DocumentScene extends Component {
     let document = this.document;
 
     if (!document) return;
-    this.isLoading = true;
     this.isSaving = true;
     document = await document.save();
-    this.isLoading = false;
+    this.isSaving = false;
 
     if (redirect || this.props.newDocument) {
       this.props.history.push(document.url);
@@ -219,7 +218,7 @@ class DocumentScene extends Component {
       <Container column auto>
         {isMoving && document && <DocumentMove document={document} />}
         {titleText && <PageTitle title={titleText} />}
-        {this.isLoading && <LoadingIndicator />}
+        {(this.isLoading || this.isSaving) && <LoadingIndicator />}
         {isFetching && (
           <CenteredContent>
             <LoadingState />
diff --git a/app/scenes/Document/components/SaveAction/SaveAction.js b/app/scenes/Document/components/SaveAction/SaveAction.js
index 48ec1d00f..27fcefbbc 100644
--- a/app/scenes/Document/components/SaveAction/SaveAction.js
+++ b/app/scenes/Document/components/SaveAction/SaveAction.js
@@ -3,7 +3,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 type Props = {
-  onClick: Function,
+  onClick: (redirect: ?boolean) => *,
   disabled?: boolean,
   isNew?: boolean,
   isSaving?: boolean,