diff --git a/src/helpers/focusManager.js b/src/helpers/focusManager.js index 9d00ebb2..0a8accd8 100644 --- a/src/helpers/focusManager.js +++ b/src/helpers/focusManager.js @@ -37,8 +37,10 @@ export function markForFocusLater() { export function returnFocus() { let toFocus = null; try { - toFocus = focusLaterElements.pop(); - toFocus.focus(); + if (focusLaterElements.length !== 0) { + toFocus = focusLaterElements.pop(); + toFocus.focus(); + } return; } catch (e) { console.warn(