diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 5c8be88e0..7572dff5d 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -112,14 +112,14 @@
         <div style="clear:both;"></div>
     </div>
 </div>
+<div id="footer">
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2019 Jean-Philippe Lang
+</div>
 </div>
 
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 <div id="ajax-modal" style="display:none;"></div>
 
-<div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2019 Jean-Philippe Lang
-</div>
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8804d2301..7a9c6497d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1,3 +1,4 @@
+html, body { min-height: 100vh; }
 html {overflow-y:scroll;}
 body { font-family: Verdana, sans-serif; font-size: 12px; color:#333; margin: 0; padding: 0; min-width: 900px; }
 
@@ -10,7 +11,9 @@ h4 {border-bottom: 1px solid #ccc; font-weight:normal;}
 pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
 
 /***** Layout *****/
+div[id^="wrapper"] { min-height: inherit; }
 #wrapper {background: white;overflow: hidden;}
+#wrapper3 { display: flex; flex-direction: column; }
 
 #top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
 #top-menu ul {margin: 0;  padding: 0;}
@@ -80,7 +83,7 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
 #admin-menu ul {margin: 0;  padding: 0;}
 #admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
 
-#main {display: flex; flex-direction: row-reverse;}
+#main {flex-grow: 2; display: flex; flex-direction: row-reverse;}
 
 #sidebar{ flex-shrink: 0; width: 22%; padding-left: 20px; background: #EEEEEE; border-left: 1px solid #ddd}
 #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }