diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 4ad770315..290a0815b 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -37,7 +37,7 @@
             {{#if canEdit}}
               {{#if showEditReason}}
                 <div class="edit-reason-input">
-                  {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
+                  {{text-field autofocus="true" value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
                 </div>
               {{else}}
                 <a {{action "displayEditReason"}} class="display-edit-reason">{{i18n 'composer.show_edit_reason'}}</a>
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 7137ef9db..738fb583e 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -284,9 +284,10 @@
       margin-left: 10px;
       top: 18px;
       #edit-reason {
-        margin: 0;
+        margin: -7px 0 0;
         padding: 5px;
         float: left;
+        width: 300px;
       }
     }
     #reply-title {