diff --git a/webmail/webmail.js b/webmail/webmail.js index 64581d5..395a5a9 100644 --- a/webmail/webmail.js +++ b/webmail/webmail.js @@ -1967,7 +1967,7 @@ const withStatus = async (action, promise, disablable, noAlert) => { if (disablable) { disablable.disabled = false; } - if (origFocus && document.activeElement !== origFocus && origFocus instanceof HTMLElement) { + if (disablable && origFocus && document.activeElement !== origFocus && origFocus instanceof HTMLElement && origFocus.parentNode) { origFocus.focus(); } if (id) { diff --git a/webmail/webmail.ts b/webmail/webmail.ts index 58f51ce..9672181 100644 --- a/webmail/webmail.ts +++ b/webmail/webmail.ts @@ -902,7 +902,7 @@ const withStatus = async (action: string, promise: Promise, disablable?: D if (disablable) { disablable.disabled = false } - if (origFocus && document.activeElement !== origFocus && origFocus instanceof HTMLElement) { + if (disablable && origFocus && document.activeElement !== origFocus && origFocus instanceof HTMLElement && origFocus.parentNode) { origFocus.focus() } if (id) {