diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 9a696dee032..dfab007b5c5 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1094,10 +1094,13 @@ instance.web.WebClient = instance.web.Client.extend({
         }
     },
     set_content_full_screen: function(fullscreen) {
-        if (fullscreen)
+        if (fullscreen) {
             $(".oe_webclient", this.$element).addClass("oe_content_full_screen");
-        else
+            $("body").css({'overflow-y':'hidden'});
+        } else {
             $(".oe_webclient", this.$element).removeClass("oe_content_full_screen");
+            $("body").css({'overflow-y':'scroll'});
+        }
     }
 });