diff --git a/modules/ui-helpers.js b/modules/ui-helpers.js
index dacdf43..d2c268e 100644
--- a/modules/ui-helpers.js
+++ b/modules/ui-helpers.js
@@ -1,3 +1,22 @@
+/**
+ * Shared UI helpers with no messenger.* dependency.
+ */
+
+/**
+ * Filters a list of template elements by the current search input and category filter.
+ * @param {string} itemSelector - CSS selector for the template items to filter.
+ */
+export function filterTemplateList(itemSelector) {
+  const query = document.getElementById("search-input").value.toLowerCase().trim();
+  const selectedCategory = document.getElementById("category-filter").value.toLowerCase();
+  for (const item of document.querySelectorAll(itemSelector)) {
+    const matchesSearch =
+      !query || item.dataset.name.includes(query) || item.dataset.subject.includes(query);
+    const matchesCategory = !selectedCategory || item.dataset.category === selectedCategory;
+    item.hidden = !(matchesSearch && matchesCategory);
+  }
+}
+
 /**
  * Populate a <select> filter element with category options, replacing any
  * previously rendered ones (first/placeholder option is preserved).
diff --git a/options/options.js b/options/options.js
index fbf5506..2d0a4fe 100644
--- a/options/options.js
+++ b/options/options.js
@@ -20,7 +20,7 @@ import {
   ATTACHMENT_TOTAL_WARN_SIZE,
   parseRecipients,
 } from "../modules/validation.js";
-import { setFilterOptions } from "../modules/ui-helpers.js";
+import { filterTemplateList, setFilterOptions } from "../modules/ui-helpers.js";
 
 let editingId = null;
 let pendingAttachments = [];
@@ -794,15 +794,7 @@ async function handleImport(file) {
 }
 
 function filterTemplates() {
-  const query = document.getElementById("search-input").value.toLowerCase().trim();
-  const selectedCategory = document.getElementById("category-filter").value.toLowerCase();
-  const cards = document.querySelectorAll("#template-list .template-card");
-  for (const card of cards) {
-    const matchesSearch =
-      !query || card.dataset.name.includes(query) || card.dataset.subject.includes(query);
-    const matchesCategory = !selectedCategory || card.dataset.category === selectedCategory;
-    card.hidden = !(matchesSearch && matchesCategory);
-  }
+  filterTemplateList("#template-list .template-card");
 }
 
 document.getElementById("search-input").addEventListener("input", filterTemplates);
diff --git a/popup/popup.js b/popup/popup.js
index 0329ee3..b5a2cba 100644
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -6,7 +6,7 @@ import {
   INSERT_MODES,
 } from "../modules/template-store.js";
 import { insertTemplateIntoTab } from "../modules/template-insert.js";
-import { setFilterOptions } from "../modules/ui-helpers.js";
+import { filterTemplateList, setFilterOptions } from "../modules/ui-helpers.js";
 import { getIdentityIdForTab } from "../modules/compose-utils.js";
 
 async function getCurrentIdentityId() {
@@ -185,15 +185,7 @@ async function insertTemplate(id) {
 }
 
 function filterTemplates() {
-  const query = document.getElementById("search-input").value.toLowerCase().trim();
-  const selectedCategory = document.getElementById("category-filter").value.toLowerCase();
-  const items = document.querySelectorAll("#template-list .template-item");
-  for (const item of items) {
-    const matchesSearch =
-      !query || item.dataset.name.includes(query) || item.dataset.subject.includes(query);
-    const matchesCategory = !selectedCategory || item.dataset.category === selectedCategory;
-    item.hidden = !(matchesSearch && matchesCategory);
-  }
+  filterTemplateList("#template-list .template-item");
 }
 
 async function populateCategoryFilter() {