From 03ac0a57c8aac3f5fa325cd9157a864973781921 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 17 Dec 2025 20:02:39 +0200
Subject: [PATCH] fix double shortcut issue

---
 client/src/views/modals/compose-email.js | 2 +-
 client/src/views/modals/edit.js          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/views/modals/compose-email.js b/client/src/views/modals/compose-email.js
index ed8e88e67f..0ff9d2f3c7 100644
--- a/client/src/views/modals/compose-email.js
+++ b/client/src/views/modals/compose-email.js
@@ -42,7 +42,7 @@ class ComposeEmailModalView extends EditModalView {
     shortcutKeys = {
         /** @this ComposeEmailModalView */
         'Control+Enter': function (e) {
-            if (this.buttonList.findIndex(item => item.name === 'send' && !item.hidden) === -1) {
+            if (this.buttonList.findIndex(item => item.name === 'send' && !item.hidden && !item.disabled) === -1) {
                 return;
             }
 
diff --git a/client/src/views/modals/edit.js b/client/src/views/modals/edit.js
index b48251bbc0..2f064b5e61 100644
--- a/client/src/views/modals/edit.js
+++ b/client/src/views/modals/edit.js
@@ -73,7 +73,7 @@ class EditModalView extends ModalView {
                 return;
             }
 
-            if (this.buttonList.findIndex(item => item.name === 'save' && !item.hidden) === -1) {
+            if (this.buttonList.findIndex(item => item.name === 'save' && !item.hidden && !item.disabled) === -1) {
                 return;
             }
 
@@ -93,7 +93,7 @@ class EditModalView extends ModalView {
                 return;
             }
 
-            if (this.buttonList.findIndex(item => item.name === 'save' && !item.hidden) === -1) {
+            if (this.buttonList.findIndex(item => item.name === 'save' && !item.hidden && !item.disabled) === -1) {
                 return;
             }