diff --git a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
index 588f4402252..2723523c209 100644
--- a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
@@ -10,6 +10,8 @@ export default DropdownSelectBoxComponent.extend({
 
   generatedHeadertext: null,
 
+  fullWidthOnMobile: true,
+
   @computed
   content() {
     const items = [
diff --git a/app/assets/javascripts/discourse/components/select-box.js.es6 b/app/assets/javascripts/discourse/components/select-box.js.es6
index 5e8b2323f51..a7d73fe6a81 100644
--- a/app/assets/javascripts/discourse/components/select-box.js.es6
+++ b/app/assets/javascripts/discourse/components/select-box.js.es6
@@ -104,8 +104,7 @@ export default Ember.Component.extend({
       const relativeLeft = this.$().offset().left - $(window).scrollLeft();
       options.left = margin - relativeLeft;
       options.width = windowWidth - margin * 2;
-      options.maxWidth = "auto";
-      options.minWidth = "auto";
+      options.maxWidth = options.minWidth = "unset";
     } else {
       const offsetLeft = boundingRect.left;
       const bodyWidth = this.$(".select-box-body").outerWidth(false);
diff --git a/app/assets/stylesheets/common/components/categories-admin-dropdown.scss b/app/assets/stylesheets/common/components/categories-admin-dropdown.scss
index 043f7eac543..9ca073f0fb7 100644
--- a/app/assets/stylesheets/common/components/categories-admin-dropdown.scss
+++ b/app/assets/stylesheets/common/components/categories-admin-dropdown.scss
@@ -5,6 +5,8 @@
 
   .select-box-row .icons {
     align-self: flex-start;
+    width: 30px;
+    justify-content: center;
 
     .d-icon {
       color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index bd755830054..cfe5b09e048 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -52,6 +52,12 @@
       margin-left: 8px;
     }
   }
+
+  .select-box {
+    &.categories-admin-dropdown, &.category-notifications-button, &.tag-notifications-button {
+      margin-top: 5px;
+    }
+  }
 }
 
 .list-container .full-width {