diff --git a/config/current.ver b/config/current.ver
index b966e81..3a1f10e 100644
--- a/config/current.ver
+++ b/config/current.ver
@@ -1 +1 @@
-1.2.4
\ No newline at end of file
+1.2.5
\ No newline at end of file
diff --git a/public/assets/js/ui-editor.js b/public/assets/js/ui-editor.js
index c616d84..07ce5f1 100644
--- a/public/assets/js/ui-editor.js
+++ b/public/assets/js/ui-editor.js
@@ -1063,7 +1063,7 @@ export function initEditor() {
   function isTemplateSection() {
     if (current?.section?.is_template) return true;
     const slug = (current?.section?.slug || '').toString().toLowerCase();
-    return slug === 'emailtemplate';
+    return slug === 'emailtemplate' || slug.includes('template');
   }
 
   async function confirmTemplateReferences(actionLabel) {
diff --git a/public/assets/js/ui-list.js b/public/assets/js/ui-list.js
index 1c96e39..38ccd56 100644
--- a/public/assets/js/ui-list.js
+++ b/public/assets/js/ui-list.js
@@ -91,7 +91,7 @@ async function openTemplateManager(item, section) {
   const isTemplateSection = () => {
     if (section?.is_template) return true;
     const slug = (section?.slug || '').toString().toLowerCase();
-    return slug === 'emailtemplate';
+    return slug === 'emailtemplate' || slug.includes('template');
   };
 
   const fetchTemplateReferences = async () => {
diff --git a/src/ApiKernel.php b/src/ApiKernel.php
index c25b236..d34f52d 100644
--- a/src/ApiKernel.php
+++ b/src/ApiKernel.php
@@ -2350,9 +2350,9 @@ class ApiKernel
 
         $templateItemsTable = $this->lookupTableName('template_items', 'emailtemplate_template_items');
         if ($this->tableExists($templateItemsTable)) {
-            $sql = "SELECT DISTINCT `template_id` FROM `$templateItemsTable` WHERE `customer_id` = :cid AND `ref_type` = :rt AND `ref_id` = :rid";
+            $sql = "SELECT DISTINCT `template_id` FROM `$templateItemsTable` WHERE `customer_id` = :cid AND `ref_type` IN ('section','template') AND `ref_id` = :rid";
             $stmt = $this->pdo->prepare($sql);
-            $stmt->execute([':cid' => $customerId, ':rt' => 'section', ':rid' => $templateId]);
+            $stmt->execute([':cid' => $customerId, ':rid' => $templateId]);
             $ids = array_filter(array_map('intval', array_column($stmt->fetchAll() ?: [], 'template_id')));
             if ($ids) {
                 if ($this->useUnifiedContent()) {