diff --git a/stylesheets/_titlebar.scss b/stylesheets/_titlebar.scss
index b1ba91cc995f..b635c120fd5e 100644
--- a/stylesheets/_titlebar.scss
+++ b/stylesheets/_titlebar.scss
@@ -30,7 +30,7 @@ body {
     --titlebar-height: calc(28px / var(--zoom-factor));
     --window-width: calc(100vw - 2 * var(--window-border));
     --window-height: calc(
-      100vh - var(--titlebar-height) - 2 * var(--window-border)
+      100vh - var(--titlebar-height) - var(--window-border)
     );
   }
 }
diff --git a/stylesheets/components/TitleBarContainer.scss b/stylesheets/components/TitleBarContainer.scss
index 97dce5dbfae9..7357c02e5016 100644
--- a/stylesheets/components/TitleBarContainer.scss
+++ b/stylesheets/components/TitleBarContainer.scss
@@ -60,7 +60,7 @@
   }
 
   &__content {
-    height: calc(100vh - var(--titlebar-height));
+    height: var(--window-height);
     position: relative;
     overflow: hidden;
   }