diff --git a/index.html b/index.html
index be89723918..241e033d0b 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<HTML style="overflow-y: scroll;">
+<HTML style="overflow: hidden;">
     <HEAD>
         <META http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <TITLE>Tryton</TITLE>
@@ -32,13 +32,13 @@ this repository contains the full copyright notices and license terms. -->
         </SCRIPT>
     </HEAD>
     <BODY>
-        <DIV style="overflow: auto;">
+        <DIV style="overflow: auto; height: 1.5em;">
             <SPAN id="user-preferences" style="float: left;"></SPAN>
             <SPAN id="user-logout" style="float: right;"></SPAN>
         </DIV>
-        <DIV id="main" style="width: 100%">
-            <DIV id="menu" style="display: inline-block; overflow: hidden; width: 20%"></DIV>
-            <DIV id="tabs" style="display: inline-block;"></DIV>
+        <DIV id="main" style="width: 100%; height: calc(100vh - 1.5em - 1px);">
+            <DIV id="menu" style="display: inline-block; width: 20%; overflow-y: auto; height: 100%;"></DIV>
+            <DIV id="tabs" style="display: inline-block; overflow-y: auto; height: 100%;"></DIV>
         </DIV>
         <SCRIPT type="text/javascript">
             jQuery(function() {
diff --git a/src/common.js b/src/common.js
index 6e0dde0cb1..c18dd00556 100644
--- a/src/common.js
+++ b/src/common.js
@@ -2195,6 +2195,7 @@
             parent = jQuery(parent);
         }
         jQuery(element).dialog('option', 'width', parent.width() * 0.8);
+        jQuery(element).dialog('option', 'height', parent.height());
         jQuery(element).dialog('option', 'position',{
                 my: 'center top',
                 at: 'center top',