diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index 5ad6824c65..5d0908be62 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -1,7 +1,7 @@
 {{#if category}}
     {{#if hasParentCategory}}
       <div class="category-status">
-        {{badgeForParentCategory}}&nbsp;{{badgeForCategory}}
+        {{badgeForParentCategory}} {{badgeForCategory}}
         <span class="topic-count">&times; {{topicCount}}</span>
       </div>
     {{else}}
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index ef3245d501..b572f3a182 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -2,9 +2,16 @@
   .category-row {
     .category-status {
       display: flex;
+      flex-wrap: wrap;
+      align-items: center;
       -webkit-box-flex: 0;
           -ms-flex: 1 1 auto;
               flex: 1 1 auto;
+
+      .badge-wrapper.box {
+        margin-bottom: 1px;
+        margin-top: 1px;
+      }
     }
   }
 }