diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 71a3657d8f5..1ddddf852b9 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -81,6 +81,7 @@
           <div class='textarea-wrapper'>
             <div class='wmd-button-bar'></div>
             <div class='wmd-preview-scroller'></div>
+            {{conditional-loading-spinner condition=model.loading}}
             {{composer-text-area tabindex="4" value=model.reply}}
             {{popup-input-tip validation=view.replyValidation shownAt=view.showReplyTip}}
           </div>
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 883607e2091..56bfa280761 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -38,6 +38,11 @@
   }
 }
 
+.textarea-wrapper .spinner {
+  z-index: 1000;
+  margin-top: 5em;
+}
+
 .saving-text .spinner {
   display: inline-block;
   left: 5px;