diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index 85174bbbfde..a18531d5bbd 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -1,27 +1,3 @@
-{{bread-crumbs categories=categories
-               category=category
-               noSubcategories=noSubcategories
-               hideSubcategories=showingSubcategoryList}}
-
-{{navigation-bar navItems=navItems filterMode=filterMode}}
-
-{{#if currentUser}}
-  {{category-notifications-button category=category}}
-{{/if}}
-
-{{#if canCreateTopic}}
-  {{d-button  id="create-topic"
-              class="btn-default"
-              action="createTopic"
-              icon="plus"
-              label="topic.create"
-              disabled=cannotCreateTopicOnCategory}}
-{{/if}}
-
-{{#if canEditCategory}}
-  {{d-button class="btn-default edit-category" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}}
-{{/if}}
-
 <section class='category-heading'>
   {{#if category.logo_url}}
     {{cdn-img src=category.logo_url class="category-logo"}}
@@ -30,3 +6,29 @@
     {{/if}}
   {{/if}}
 </section>
+
+<div class='category-navigation'>
+  {{bread-crumbs categories=categories
+                 category=category
+                 noSubcategories=noSubcategories
+                 hideSubcategories=showingSubcategoryList}}
+
+  {{navigation-bar navItems=navItems filterMode=filterMode}}
+
+  {{#if currentUser}}
+    {{category-notifications-button category=category}}
+  {{/if}}
+
+  {{#if canCreateTopic}}
+    {{d-button  id="create-topic"
+                class="btn-default"
+                action="createTopic"
+                icon="plus"
+                label="topic.create"
+                disabled=cannotCreateTopicOnCategory}}
+  {{/if}}
+
+  {{#if canEditCategory}}
+    {{d-button class="btn-default edit-category" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}}
+  {{/if}}
+</div>
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 63d3e9679aa..b9059b0dd43 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -289,6 +289,10 @@ button.dismiss-read {
   }
 }
 
+.category-navigation {
+  clear: both;
+}
+
 .category-logo {
   max-height: 150px;
   float: left;