diff --git a/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs
index 45533d2d7a3..76ba9ebddf3 100644
--- a/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs
@@ -1,7 +1,7 @@
 <div class='autocomplete'>
   <ul>
     {{#each option in options}}
-      <li>{{category-link option allowUncategorized="true" link="false"}}</li>
+      <li><a>{{category-link option allowUncategorized="true" link="false"}}</a></li>
     {{/each}}
   </ul>
 </div>
diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index 0e6aae9649f..bff91171960 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -93,6 +93,24 @@ h1 a.badge-category div {vertical-align: top;}
   float: left;
 }
 
+.user-preferences .autocomplete .badge-wrapper .badge-category {
+  margin: 2px;
+  font-weight: normal;
+}
+
+.user-preferences .autocomplete .selected .badge-wrapper .badge-category {
+  font-weight: bold;
+}
+
+.ac-wrap {
+  .badge-wrapper span {
+    padding-top: 3px;
+    padding-bottom: 0;
+    height: 20px;
+    max-width: 200px;
+  }
+}
+
 // specific styles for badge categories
 
 .bar .badge-category {
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 577612b09c0..cc3fe231583 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -26,15 +26,6 @@
     width: 500px;
   }
 
-  .autocomplete .badge-category {
-    margin: 2px;
-    font-weight: normal;
-  }
-
-  .autocomplete .badge-category.selected {
-    font-weight: bold;
-  }
-
   textarea {
     width: 530px;
     height: 100px;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 4bcdc90685a..7bddfa17927 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -94,15 +94,6 @@
   input.category-group {
   }
 
-  .autocomplete .badge-category {
-    margin: 2px;
-    font-weight: normal;
-  }
-
-  .autocomplete .badge-category.selected {
-    font-weight: bold;
-  }
-
   textarea {
     height: 100px;
   }