diff --git a/application/views/admin/emailtemplates/email_language_template_tab.php b/application/views/admin/emailtemplates/email_language_template_tab.php
index 2ac8c326f10..4b145d9c81b 100644
--- a/application/views/admin/emailtemplates/email_language_template_tab.php
+++ b/application/views/admin/emailtemplates/email_language_template_tab.php
@@ -59,7 +59,7 @@
     <div class="row">
             <label class='form-label col-12' for="attachments_<?php echo "{$grouplang}-{$tab}"; ?>"><?php echo $details['attachments']; ?></label>
             <div class="col-12">
-                <button class="add-attachment btn btn-outline-secondary" data-bs-target="#attachments-<?php echo $grouplang; ?>-<?php echo $tab ?>" data-ck-target="<?="email_{$tab}_{$grouplang}"?>" id="add-attachment-<?php echo "{$grouplang}-{$tab}"; ?>"><?php eT("Add file"); ?></button> &nbsp;
+                <button class="add-attachment btn btn-outline-secondary" data-target="#attachments-<?php echo $grouplang; ?>-<?php echo $tab ?>" data-ck-target="<?="email_{$tab}_{$grouplang}"?>" id="add-attachment-<?php echo "{$grouplang}-{$tab}"; ?>"><?php eT("Add file"); ?></button> &nbsp;
             </div>
     </div>
 
diff --git a/assets/packages/emailtemplates/emailtemplates.js b/assets/packages/emailtemplates/emailtemplates.js
index b1d2332ec2a..188a07cbb47 100644
--- a/assets/packages/emailtemplates/emailtemplates.js
+++ b/assets/packages/emailtemplates/emailtemplates.js
@@ -14,7 +14,7 @@ var PrepEmailTemplates = function(){
         }
         addAttachment(currentTarget, url);
         window.KCFinder = null;
-        const modal = new bootstrap.Modal(document.getElementById('kc-modal-open'));
+        const modal = bootstrap.Modal.getOrCreateInstance(document.getElementById('kc-modal-open'));
         modal.hide();
     },
     
@@ -103,7 +103,7 @@ var PrepEmailTemplates = function(){
             $(newrow).find('input.relevance').val(relevance).attr('name', 'attachments' + templatetype + '[' + index + '][relevance]');
             $(newrow).find('input.filename').attr('name', 'attachments' + templatetype + '[' + index + '][url]');
             $(newrow).appendTo($(target).find('tbody'));
-            const modal = new bootstrap.Modal(document.getElementById('kc-modal-open'));
+            const modal = bootstrap.Modal.getOrCreateInstance(document.getElementById('kc-modal-open'));
             modal.hide();
         }
         else