diff --git a/public/js/tabulator/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
index 79fd19743..9115b0785 100644
--- a/public/js/tabulator/filters/extendedHeaderFilter.js
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -168,22 +168,7 @@ export function customTagFilter(cell, onRendered, success, cancel, params) {
     }
   };
 
-  input.addEventListener("input", () => {
-    success(input.value);
-  });
-  input.addEventListener("change", () => {
-    success(input.value);
-  });
-  input.addEventListener("keydown", (event) => {
-    if (event.key !== "Escape") return;
-
-    event.preventDefault();
-    event.stopPropagation();
-    clearFilter();
-  });
-  input.addEventListener("focus", (e) => {
-    e.stopPropagation();
-
+  const openDropdown = () => {
     if (activeTagDropdownCleanup) {
       activeTagDropdownCleanup();
     }
@@ -206,9 +191,28 @@ export function customTagFilter(cell, onRendered, success, cancel, params) {
     window.addEventListener("scroll", positionDropdown, true);
     window.addEventListener("resize", positionDropdown);
     document.addEventListener("mousedown", handleOutsideClick, true);
-  });
+  };
 
-  input.addEventListener("blur", (e) => {
+  input.addEventListener("input", () => {
+    success(input.value);
+  });
+  input.addEventListener("change", () => {
+    success(input.value);
+  });
+  input.addEventListener("keydown", (event) => {
+    if (event.key !== "Escape") return;
+
+    event.preventDefault();
+    event.stopPropagation();
+
+    clearFilter({closeDropdownAfterClear: false});
+
+    openDropdown();
+  });
+  input.addEventListener("focus", (e) => {
+    e.stopPropagation();
+
+    openDropdown();
   });
 
   container.appendChild(input);
diff --git a/public/js/tabulator/formatter/tags.js b/public/js/tabulator/formatter/tags.js
index 06d252d0e..48a66a10c 100644
--- a/public/js/tabulator/formatter/tags.js
+++ b/public/js/tabulator/formatter/tags.js
@@ -94,7 +94,7 @@ export function tagFormatter(cell, tagComponent, onRendered) {
       return;
     }
 
-    let widthBuffer = 15;
+    let widthBuffer = 10;
     maxVisibleTags = parsedTags.length;
     renderTags();