diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 64967312079..71a3657d8f5 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -113,7 +113,6 @@
             <a href {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
           </div>
         {{/if}}
-
       </div>
     {{else}}
       <div class='row'>
@@ -122,7 +121,7 @@
             {{#if model.createdPost}}
               {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
             {{else}}
-              {{i18n 'composer.saving'}}
+              {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
             {{/if}}
           </div>
           <div class='draft-text'>
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 2838b2d8902..883607e2091 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -38,6 +38,12 @@
   }
 }
 
+.saving-text .spinner {
+  display: inline-block;
+  left: 5px;
+  top: 4px;
+}
+
 div.ac-wrap.disabled {
   input {
     display:none;
@@ -47,7 +53,6 @@ div.ac-wrap.disabled {
   }
 }
 
-
 div.ac-wrap {
   background-color: $secondary;
   border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 53c76cb12be..d9c73c31940 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -870,7 +870,7 @@ en:
       show_edit_reason: "(add edit reason)"
       reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images."
       view_new_post: "View your new post."
-      saving: "Saving..."
+      saving: "Saving"
       saved: "Saved!"
       saved_draft: "Post draft in progress. Select to resume."
       uploading: "Uploading..."