[MERGE] forward port branch saas-16 up to 64d56995e04

1 files changed, 6 insertions, 7 deletions

diff --git a/addons/web/static/src/js/core/dialog.js b/addons/web/static/src/js/core/dialog.js
index 6214c99483e..11ce34770de 100644
--- a/addons/web/static/src/js/core/dialog.js
+++ b/addons/web/static/src/js/core/dialog.js
@@ -151,13 +151,12 @@ var Dialog = Widget.extend({
         this.$modal.modal('hide');
         this.$modal.remove();
 
-        setTimeout(function () { // Keep class modal-open (deleted by bootstrap hide fnct) on body to allow scrolling inside the modal
-            var modals = $('body > .modal').filter(':visible');
-            if(modals.length) {
-                modals.last().focus();
-                $('body').addClass('modal-open');
-            }
-        }, 0);
+        var modals = $('body > .modal').filter(':visible');
+        if (modals.length) {
+            modals.last().focus();
+            // Keep class modal-open (deleted by bootstrap hide fnct) on body to allow scrolling inside the modal
+            $('body').addClass('modal-open');
+        }
     }
 });