[MERGE] forward port branch saas-12.1 up to 8aa8548d8ab

1 files changed, 3 insertions, 3 deletions

diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js
index c798189c0a0..107c6e314eb 100644
--- a/addons/web/static/src/js/chrome/action_manager.js
+++ b/addons/web/static/src/js/chrome/action_manager.js
@@ -332,9 +332,6 @@ var ActionManager = Widget.extend({
                 // update the internal state and the DOM
                 self._pushController(controller);
 
-                // toggle the fullscreen mode for actions in target='fullscreen'
-                self._toggleFullscreen();
-
                 // store the action into the sessionStorage so that it can be
                 // fully restored on F5
                 self.call('session_storage', 'setItem', 'current_action', action._originalAction);
@@ -720,6 +717,9 @@ var ActionManager = Widget.extend({
             action: this.getCurrentAction(),
             controller: controller,
         });
+
+        // toggle the fullscreen mode for actions in target='fullscreen'
+        this._toggleFullscreen();
     },
     /**
      * Pushes the given state, with additional information about the given