diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 9226c11b3..68e5c3a2a 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -95,7 +95,9 @@ so I'm going to stop rendering it until we figure out what's up
               <a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n 'upload'}}</a>
               <input type="file" id="mobile-uploader" />
             {{/if}}
-            <div id='draft-status'>{{model.draftStatus}}</div>
+            <div id='draft-status' {{bind-attr class="view.isUploading:hidden"}}>
+              {{model.draftStatus}}
+            </div>
           </div>
         </div>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b078cd1d7..81a8405c9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -674,7 +674,7 @@ en:
 
       add_warning: "This is an official warning."
       posting_not_on_topic: "Which topic do you want to reply to?"
-      saving_draft_tip: "saving"
+      saving_draft_tip: "saving..."
       saved_draft_tip: "saved"
       saved_local_draft_tip: "saved locally"
       similar_topics: "Your topic is similar to..."