diff --git a/modules/backend/assets/vendor/sweet-alert/sweet-alert.js b/modules/backend/assets/vendor/sweet-alert/sweet-alert.js index 9ca8e0f97..7174ac61d 100644 --- a/modules/backend/assets/vendor/sweet-alert/sweet-alert.js +++ b/modules/backend/assets/vendor/sweet-alert/sweet-alert.js @@ -386,7 +386,13 @@ function handleOnBlur(e) { var $targetElement = e.target || e.srcElement, $focusElement = e.relatedTarget, - modalIsVisible = hasClass(modal, 'visible'); + modalIsVisible = hasClass(modal, 'visible'), + bootstrapModalIsVisible = document.querySelector('.control-popup.modal') || false; + + if(bootstrapModalIsVisible) { + // Bootstrap will enforce focus on the existing model, so don't do anything here to prevent infinite loop + return; + } if (modalIsVisible) { var btnIndex = -1; // Find the button - note, this is a nodelist, not an array.