diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 306f2924b44..b46760d5c1b 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,8 +1,8 @@
 {{#if visible}}
   <div class="row">
     <div id="banner" class={{overlay}}>
+      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
       <div id="banner-content">
-        <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
         {{{banner.html}}}
         {{#if currentUser.staff}}
           <p><a href="{{banner.url}}">{{{i18n "banner.edit"}}}</a></p>
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index aa739f782ab..127400ea6f7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -44,7 +44,7 @@
 }
 
 // global styles for the cooked HTML content in posts (and preview)
-.cooked, .d-editor-preview {
+.cooked, .d-editor-preview, #banner-content {
   word-wrap: break-word;
   h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; }
   h1 { line-height: 1em; } /* normalize.css sets h1 font size but not line height */