diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index c754c01bb..34dc4acb9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -962,21 +962,6 @@
         }
     }
 
-    async function handleTemplateSelectChange($select) {
-        const selectedTemplateId = $select.val();
-        if (!selectedTemplateId) return;
-
-        $select.val('');
-
-        const template = await fetchTemplateById(selectedTemplateId);
-        if (!template) {
-            abp.notify.error('Template not found.');
-            return;
-        }
-
-        await applyTemplateToEmail(template);
-    }
-
     async function fetchTemplateById(templateId) {
         let templates = cachedTemplates;
         if (!templates) {
@@ -995,15 +980,6 @@
         return templates.find(t => t.id === templateId || t.Id === templateId);
     }
 
-    async function handleTemplateSelectOpen($select) {
-        try {
-            await ensureTemplatesSelectOptionsLoaded($select);
-        } catch (err) {
-            console.error('Failed to load templates:', err);
-            abp.notify.error('Failed to load templates.');
-        }
-    }
-
     function updateSelectedTemplateLabel(templateName, templateId) {
         const normalizedTemplateName = normalizeTemplateName(templateName);
         const dropdownLabel = normalizedTemplateName || 'Templates';
@@ -1407,24 +1383,8 @@
 
                     // Templates button - add to TinyMCE menu bar at bottom
                     if (!$menubar.find('.templates-button-container').length) {
-                        // Create select element for templates
-                        const $templatesSelect = $('<select>')
-                            .addClass('templates-select templates-button-container')
-                            .attr('title', 'Select a template to apply');
-
-                        // Keep "Templates" as the control label, but not as a selectable option.
-                        $('<option>')
-                            .val('')
-                            .text('Templates')
-                            .prop('selected', true)
-                            .prop('disabled', true)
-                            .prop('hidden', true)
-                            .appendTo($templatesSelect);
-
-                        $templatesSelect
-                            .on('change', handleTemplateSelectChange)
-                            .on('click', handleTemplateSelectOpen);
-
+                        const $templatesSelect = createTemplateSelect(templateName, isViewingDraft);
+                        bindTemplateSelectEvents($templatesSelect, isViewingDraft);
                         $menubar.append($templatesSelect);
                     }
                 }, 0);  // setTimeout for rendering after editor init
@@ -2067,25 +2027,38 @@
     }
 
     function bindTemplateSelectEvents($select, isDraft) {
-        $select.on('change', function () {
-            handleTemplateSelectChangeWithDraftCheck($(this), isDraft);
+        $select.on('change', async function () {
+            if (!isDraft) return;
+            const $this = $(this);
+            const selectedTemplateId = $this.val();
+            if (!selectedTemplateId) return;
+            
+            $this.val('');
+            
+            const template = await fetchTemplateById(selectedTemplateId);
+            if (!template) {
+                abp.notify.error('Template not found.');
+                return;
+            }
+            
+            await applyTemplateToEmail(template);
         });
 
-        $select.on('click', function (e) {
-            handleTemplateSelectOpenWithDraftCheck($(this), isDraft);
+        $select.on('click', async function (e) {
+            if (!isDraft || $(this).prop('disabled')) {
+                e.preventDefault();
+                return;
+            }
+            
+            try {
+                await ensureTemplatesSelectOptionsLoaded($(this));
+            } catch (err) {
+                console.error('Failed to load templates:', err);
+                abp.notify.error('Failed to load templates.');
+            }
         });
     }
 
-    function handleTemplateSelectChangeWithDraftCheck($select, isDraft) {
-        if (!isDraft) return;
-        handleTemplateSelectChange($select);
-    }
-
-    function handleTemplateSelectOpenWithDraftCheck($select, isDraft) {
-        if (!isDraft || $select.prop('disabled')) return;
-        handleTemplateSelectOpen($select);
-    }
-
     PubSub.subscribe('email_selected', (msg, data) => {
         console.log("EMAIL SELECTED EVENT FIRED", data);