diff --git a/public/js/tabulator/formatter/tags.js b/public/js/tabulator/formatter/tags.js
index 2200ca669..06d252d0e 100644
--- a/public/js/tabulator/formatter/tags.js
+++ b/public/js/tabulator/formatter/tags.js
@@ -94,12 +94,13 @@ export function tagFormatter(cell, tagComponent, onRendered) {
       return;
     }
 
+    let widthBuffer = 15;
     maxVisibleTags = parsedTags.length;
     renderTags();
 
     while (
       maxVisibleTags > 0 &&
-      container.scrollWidth > container.clientWidth
+      container.scrollWidth > (container.clientWidth + widthBuffer)
     ) {
       maxVisibleTags--;
       renderTags();