diff --git a/app/assets/javascripts/app/views/widget/tag.jst.eco b/app/assets/javascripts/app/views/widget/tag.jst.eco
index 76d20b730..ff6b8646a 100644
--- a/app/assets/javascripts/app/views/widget/tag.jst.eco
+++ b/app/assets/javascripts/app/views/widget/tag.jst.eco
@@ -9,6 +9,6 @@
   <% end %>
 </ul>
 <div class="text-muted js-newTagLabel u-clickable">+ <%- @T('Add Tag') %></div>
-<form>
+<form class="ui-front">
   <input type="text" name="new_tag" class="hide js-newTagInput" autocomplete="off">
 </form>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 4f4961cba..c5372c318 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -6855,6 +6855,8 @@ footer {
 .ui-autocomplete.ui-widget-content {
   @extend .zIndex-8;
   position: absolute;
+  max-height: 380px;
+  overflow: auto;
 }
 
 .ui-menu {