diff --git a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars
index 7a257de142f..6ed3e444e3a 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars
@@ -7,20 +7,20 @@
   {{custom-html "extraNavItem"}}
 </ul>
 
+{{#if canChangeCategoryNotificationLevel}}
+  {{view 'category-notifications-button' category=category}}
+{{/if}}
+
+{{#if canCreateTopic}}
+  <button id="create-topic" class='btn btn-default' {{action createTopic}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+{{/if}}
+
+{{#if canEditCategory}}
+  <button class='btn btn-default' {{action editCategory category}}><i class="fa fa-wrench"></i> {{i18n category.edit_long}}</button>
+{{/if}}
+
 <section class='category-heading'>
   {{#if category.logo_url}}
-  <img {{bind-attr src=category.logo_url}} class="category-logo">
-  {{/if}}
-
-  {{#if canChangeCategoryNotificationLevel}}
-    {{view 'category-notifications-button' category=category}}
-  {{/if}}
-
-  {{#if canCreateTopic}}
-    <button id="create-topic" class='btn btn-default' {{action createTopic}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
-  {{/if}}
-
-  {{#if canEditCategory}}
-    <button class='btn btn-default' {{action editCategory category}}><i class="fa fa-wrench"></i> {{i18n category.edit_long}}</button>
+    <img {{bind-attr src=category.logo_url}} class="category-logo">
   {{/if}}
 </section>