diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index c1ee046348..8802d1c9b2 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -26,11 +26,11 @@
         {{#if showDescription}}
           <div class='description'>{{{description}}}</div>
         {{/if}}
+        {{#if showMessageInput}}
+          {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
+          <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
+        {{/if}}
       </div>
     </label>
-    {{#if showMessageInput}}
-      {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
-      <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
-    {{/if}}
   </div>
 {{/if}}
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index 41c8edf3e4..ddede9fca8 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -97,7 +97,7 @@
 }
 
 .flag-message {
-  width: 95% !important;
+  width: 95%;
   margin: 0;
 }