diff --git a/new-ui/src/pages/full/OverviewPage/style.scss b/new-ui/src/pages/full/OverviewPage/style.scss
index 32d8c8a0..73164cbb 100644
--- a/new-ui/src/pages/full/OverviewPage/style.scss
+++ b/new-ui/src/pages/full/OverviewPage/style.scss
@@ -8,7 +8,7 @@
     height: 100%;
     width: 100%;
     overflow: hidden;
-    max-height: calc(100dvh - 50px);
+    max-height: 100%;
   }
 
   .overview-content {
diff --git a/new-ui/src/shared/components/ModalFoundation/style.scss b/new-ui/src/shared/components/ModalFoundation/style.scss
index 4bdf7e72..62c52ab4 100644
--- a/new-ui/src/shared/components/ModalFoundation/style.scss
+++ b/new-ui/src/shared/components/ModalFoundation/style.scss
@@ -7,11 +7,11 @@
     .backdrop {
       position: fixed;
       left: 0;
+      right: 0;
       top: var(--window-decorations-height);
+      bottom: 0;
       display: block;
       content: ' ';
-      width: 100%;
-      height: calc(100dvh - var(--window-decorations-height));
       z-index: 4;
     }
 
@@ -19,9 +19,9 @@
       overflow: auto;
       position: fixed;
       left: 0;
+      right: 0;
       top: var(--window-decorations-height);
-      width: 100%;
-      height: calc(100dvh - var(--window-decorations-height));
+      bottom: 0;
       z-index: 4;
       display: flex;
       flex-flow: column;
diff --git a/new-ui/src/shared/components/WindowDecorations/style.scss b/new-ui/src/shared/components/WindowDecorations/style.scss
index e5920f08..cb347f4c 100644
--- a/new-ui/src/shared/components/WindowDecorations/style.scss
+++ b/new-ui/src/shared/components/WindowDecorations/style.scss
@@ -7,6 +7,7 @@
   justify-content: flex-end;
   width: 100%;
   height: var(--window-decorations-height);
+  flex-shrink: 0;
   border-bottom: 1px solid var(--border-disabled);
   box-sizing: border-box;
 
diff --git a/new-ui/src/shared/components/wizard/WizardPage/style.scss b/new-ui/src/shared/components/wizard/WizardPage/style.scss
index 4d909fd7..f6adcd62 100644
--- a/new-ui/src/shared/components/wizard/WizardPage/style.scss
+++ b/new-ui/src/shared/components/wizard/WizardPage/style.scss
@@ -1,7 +1,7 @@
 .wizard-page {
   --page-content-limit: 536px;
 
-  height: calc(100dvh - var(--window-decorations-height));
+  height: 100%;
   overflow-y: auto;
 
   > .page-grid {
diff --git a/new-ui/src/shared/layouts/FullPageLayout/style.scss b/new-ui/src/shared/layouts/FullPageLayout/style.scss
index 59e4fd14..139d5dc2 100644
--- a/new-ui/src/shared/layouts/FullPageLayout/style.scss
+++ b/new-ui/src/shared/layouts/FullPageLayout/style.scss
@@ -2,7 +2,7 @@
   display: grid;
   grid-template-columns: 52px 1fr;
   grid-template-rows: 50px 1fr;
-  height: calc(100dvh - var(--window-decorations-height));
+  height: 100%;
   overflow: hidden;
 
   #window-header {
diff --git a/new-ui/src/shared/scss/_base.scss b/new-ui/src/shared/scss/_base.scss
index 5cef2d1e..03cef551 100644
--- a/new-ui/src/shared/scss/_base.scss
+++ b/new-ui/src/shared/scss/_base.scss
@@ -14,6 +14,7 @@ html,
 body {
   padding: 0;
   margin: 0;
+  height: 100%;
   overscroll-behavior: none;
 }
 
@@ -25,10 +26,21 @@ body {
 
 #root,
 #app {
-  min-height: 100dvh;
+  min-height: 100vh;
+  height: 100%;
   overflow: hidden;
 }
 
+#app {
+  display: flex;
+  flex-flow: column;
+}
+
+#app-content {
+  flex: 1 1 auto;
+  min-height: 0;
+}
+
 input[type='password']::-ms-reveal,
 input[type='password']::-ms-clear {
   display: none;