diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 4f2d59630..d7d74fb14 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -99,27 +99,27 @@
             <a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
           {{/if}}
           <div class="title-wrapper">
-          <h1>
-            {{#if showPrivateMessageGlyph}}
-              <span class="private-message-glyph">{{fa-icon envelope}}</span>
-            {{/if}}
-
-            {{#if topic.details.loaded}}
-              {{topic-status topic=topic}}
-              <a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
-            {{else}}
-              {{#if topic.errorLoading}}
-                {{topic.errorTitle}}
-              {{else}}
-                {{i18n topic.loading}}
+            <h1>
+              {{#if showPrivateMessageGlyph}}
+                <span class="private-message-glyph">{{fa-icon envelope}}</span>
               {{/if}}
+
+              {{#if topic.details.loaded}}
+                {{topic-status topic=topic}}
+                <a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
+              {{else}}
+                {{#if topic.errorLoading}}
+                  {{topic.errorTitle}}
+                {{else}}
+                  {{i18n topic.loading}}
+                {{/if}}
+              {{/if}}
+            </h1>
+            {{#if topic.category.parentCategory}}
+              {{bound-category-link topic.category.parentCategory onlyStripe="true"}}
             {{/if}}
-          </h1>
-          {{#if topic.category.parentCategory}}
-            {{bound-category-link topic.category.parentCategory onlyStripe="true"}}
-          {{/if}}
-          {{bound-category-link topic.category onlyStripe="true"}}
-        </div>
+            {{bound-category-link topic.category onlyStripe="true"}}
+          </div>
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index a79b9f703..81c24093c 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -9,14 +9,11 @@
   {{#if postStream.firstPostPresent}}
     <div id='topic-title'>
       <div class='container'>
+        {{#if showStarButton}}
+          <a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
+        {{/if}}
 
-          {{#if showStarButton}}
-            <a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
-          {{/if}}
-
-          <div class="title-wrapper">
-
-
+        <div class="title-wrapper">
           {{#if editingTopic}}
             {{#if isPrivateMessage}}
               <span class="private-message-glyph">{{fa-icon envelope}}</span>
@@ -56,12 +53,10 @@
               {{/if}}
               {{bound-category-link category}}
             {{/unless}}
-
-        </div>
-
           {{/if}}
-          {{plugin-outlet "topic-title"}}
         </div>
+        {{plugin-outlet "topic-title"}}
+      </div>
     </div>
   {{/if}}