diff --git a/client/app/assets/css/login.css b/client/app/assets/css/login.css
index cf46eefb0..1120ec1e7 100644
--- a/client/app/assets/css/login.css
+++ b/client/app/assets/css/login.css
@@ -15,7 +15,7 @@ body {
   display: table;
   width: 100%;
   padding: 10px;
-  height: calc(100vh - 116px);
+  height: calc(100% - 116px);
 }
 
 @media (min-width: 992px) {
diff --git a/client/app/assets/less/inc/base.less b/client/app/assets/less/inc/base.less
index 14a37f347..80dc02e81 100755
--- a/client/app/assets/less/inc/base.less
+++ b/client/app/assets/less/inc/base.less
@@ -20,7 +20,7 @@ html {
 
 html,
 body {
-  min-height: 100vh;
+  height: 100%;
 }
 
 body {
@@ -35,7 +35,7 @@ body {
 }
 
 #application-root {
-  min-height: 100vh;
+  height: 100%;
 }
 
 #application-root,
diff --git a/client/app/assets/less/inc/login.less b/client/app/assets/less/inc/login.less
index 81ee07779..a82015935 100755
--- a/client/app/assets/less/inc/login.less
+++ b/client/app/assets/less/inc/login.less
@@ -10,7 +10,7 @@
         vertical-align: middle; 
         display: inline-block;
         width: 1px;
-        height: 100vh;
+        height: 100%;
     }
 }
 
@@ -135,4 +135,4 @@
 
     }
 }
- 
\ No newline at end of file
+
diff --git a/client/app/assets/less/redash/query.less b/client/app/assets/less/redash/query.less
index 57bccbc8c..6a5e872fc 100644
--- a/client/app/assets/less/redash/query.less
+++ b/client/app/assets/less/redash/query.less
@@ -8,7 +8,7 @@ body.fixed-layout {
     padding-bottom: 0;
 
     width: 100vw;
-    height: 100vh;
+    height: 100%;
 
     .application-layout-content > div {
       display: flex;
@@ -90,7 +90,7 @@ body.fixed-layout {
 .embed__vis {
   display: flex;
   flex-flow: column;
-  height: calc(~'100vh - 25px');
+  height: calc(~'100% - 25px');
 
   > .embed-heading {
     flex: 0 0 auto;
diff --git a/client/app/components/ApplicationArea/ApplicationLayout/index.less b/client/app/components/ApplicationArea/ApplicationLayout/index.less
index 8da48be1a..74074f686 100644
--- a/client/app/components/ApplicationArea/ApplicationLayout/index.less
+++ b/client/app/components/ApplicationArea/ApplicationLayout/index.less
@@ -7,10 +7,10 @@ body #application-root {
   flex-direction: row;
   justify-content: stretch;
   padding-bottom: 0 !important;
-  height: 100vh;
+  height: 100%;
 
   .application-layout-side-menu {
-    height: 100vh;
+    height: 100%;
     position: relative;
 
     @media @mobileBreakpoint {
@@ -47,6 +47,10 @@ body #application-root {
   }
 }
 
+body > section {
+  height: 100%;
+}
+
 body.fixed-layout #application-root {
   .application-layout-content {
     padding-bottom: 0;
diff --git a/client/app/pages/dashboards/PublicDashboardPage.less b/client/app/pages/dashboards/PublicDashboardPage.less
index ed03e4f4f..51c36549a 100644
--- a/client/app/pages/dashboards/PublicDashboardPage.less
+++ b/client/app/pages/dashboards/PublicDashboardPage.less
@@ -8,7 +8,7 @@
   }
 
   > .container {
-    min-height: calc(100vh - 95px);
+    min-height: calc(100% - 95px);
   }
 
   .loading-message {