diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
new file mode 100644
index 000000000..8a914440e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
@@ -0,0 +1,6 @@
+{{#if topic.category.parentCategory}}
+  {{bound-category-link topic.category.parentCategory}}
+{{/if}}
+{{bound-category-link topic.category hideParent=true}}
+
+{{plugin-outlet "topic-category"}}
diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 24aa48c71..85056267f 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -112,10 +112,7 @@
                 {{/if}}
               {{/if}}
             </h1>
-            {{#if topic.category.parentCategory}}
-              {{bound-category-link topic.category.parentCategory}}
-            {{/if}}
-            {{bound-category-link topic.category hideParent=true}}
+            {{topic-category topic=topic}}
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 878fa421e..f1c0e22c4 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -43,11 +43,7 @@
             </h1>
 
             {{#unless isPrivateMessage}}
-              {{#if category.parentCategory}}
-                {{bound-category-link category.parentCategory}}
-              {{/if}}
-              {{bound-category-link category hideParent=true}}
-              {{plugin-outlet "topic-category"}}
+              {{topic-category topic=model}}
             {{/unless}}
           {{/if}}
         </div>