diff --git a/addons/web/static/src/js/core/dialog.js b/addons/web/static/src/js/core/dialog.js
index 9fa42fb6e2b..492ea06c7bd 100644
--- a/addons/web/static/src/js/core/dialog.js
+++ b/addons/web/static/src/js/core/dialog.js
@@ -182,10 +182,10 @@ var Dialog = Widget.extend({
             self.$modal.removeAttr("aria-hidden");
             self.$modal.modal('show');
             self._opened.resolve();
+            if (options && options.shouldFocusButtons) {
+                self._onFocusControlButton();
+            }
         });
-        if (options && options.shouldFocusButtons) {
-            self._onFocusControlButton();
-        }
 
         return self;
     },