diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js
index e72db2c3a0c..905d9c1c3b9 100644
--- a/addons/web/static/src/js/chrome/action_manager.js
+++ b/addons/web/static/src/js/chrome/action_manager.js
@@ -283,7 +283,8 @@ var ActionManager = Widget.extend({
 
         // Listen to event "DOM_updated" to restore the scroll position
         core.bus.on('DOM_updated', this, function() {
-            if (this.inner_action) {
+            // DO NOT FORWARDPORT THIS
+            if (this.inner_action && !$('.dialog').length) {
                 this.trigger_up('scrollTo', {offset: this.inner_action.getScrollTop() || 0});
             }
         });