diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index f6911751204..f26c0623175 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -171,6 +171,10 @@ header .discourse-tag {color: $tag-color }
 .tag-chooser {
   width: 100%;
   margin: 5px 0;
+  ul.select2-choices {
+    max-height: 40px;
+    overflow-y: auto;
+  }
 }
 
 .title-wrapper .tag-chooser {