diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css
index 04733e9b660..08ad6e7dcdd 100644
--- a/addons/web/static/src/css/base_old.css
+++ b/addons/web/static/src/css/base_old.css
@@ -1,11 +1,14 @@
 .openerp {
     padding: 0;
     margin: 0;
-    height: 100%;
     font-size: 80%;
     font-family: Ubuntu, Helvetica, sans-serif;
 }
 
+.openerp .openerp-web-client-container {
+    height: 100%;
+}
+
 .openerp, .openerp textarea, .openerp input, .openerp select, .openerp option,
 .openerp button, .openerp .ui-widget {
     font-family: Ubuntu, Helvetica, sans-serif;
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 277c7ef5652..4a8a7bbdfe0 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -982,7 +982,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
     },
     start: function() {
         var self = this;
-        this.$element.addClass("openerp openerp2");
+        this.$element.addClass("openerp openerp2 openerp-web-client-container");
         if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
             this.$element.addClass("kitten-mode-activated");
             this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {