diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 6f3f0c7990b..ef366d102f9 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -200,6 +200,7 @@ header .discourse-tag {color: $tag-color }
 
 .tag-chooser {
   width: 100%;
+  max-width: 100%;
   margin: 5px 0;
   ul.select2-choices {
     max-height: 30px;
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index ebf8f68ca5d..afe80508545 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -116,6 +116,7 @@
 
 .edit-category-modal {
   .modal-body {
+    box-sizing: border-box;
     position: relative;
     height: 350px;
   }