diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 5e875e47826..37f86581e22 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -70,6 +70,7 @@
         padding: 0;
         min-width: 100px;
         max-height: 300px;
+        max-width: 30em;
 
         .collection-header {
           .category-filter {
@@ -129,7 +130,7 @@
         .badge-wrapper {
           margin: 0;
           display: flex;
-          flex: 1;
+          flex: 1 1 auto;
         }
       }
 
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index 70758e474a6..47d4d2d9204 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -4,6 +4,7 @@
       display: flex;
       flex-wrap: wrap;
       align-items: center;
+      max-width: 100%;      
       -webkit-box-flex: 0;
           -ms-flex: 1 1 auto;
               flex: 1 1 auto;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index ccd908b9681..26e4ba82429 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -94,9 +94,9 @@
 
     .selected-name {
       text-align: left;
-      -webkit-box-flex: 1 100%;
-              -ms-flex: 1 100%;
-                  flex: 1 100%;
+      -webkit-box-flex: 1 1 auto;
+              -ms-flex: 1 1 auto;
+                  flex: 1 1 auto;
       -o-text-overflow: ellipsis;
          text-overflow: ellipsis;
       white-space: nowrap;