diff --git a/stylesheets/components/TitleBarContainer.scss b/stylesheets/components/TitleBarContainer.scss
index 6598ac30e58f..45a920d29b51 100644
--- a/stylesheets/components/TitleBarContainer.scss
+++ b/stylesheets/components/TitleBarContainer.scss
@@ -58,7 +58,7 @@
   }
 
   &__content {
-    height: var(--window-height);
+    height: calc(100vh - var(--titlebar-height));
     position: relative;
   }
 }
diff --git a/ts/components/TitleBarContainer.tsx b/ts/components/TitleBarContainer.tsx
index 946a51223f71..5b7ea02e2140 100644
--- a/ts/components/TitleBarContainer.tsx
+++ b/ts/components/TitleBarContainer.tsx
@@ -215,7 +215,7 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
     [theme, hideMenuBar]
   );
 
-  if (!hasCustomTitleBar || isFullScreen) {
+  if (!hasCustomTitleBar) {
     return <>{children}</>;
   }
 
@@ -253,22 +253,25 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
     <div
       className={classNames(
         'TitleBarContainer',
-        isWindowActive ? 'TitleBarContainer--active' : null
+        isWindowActive ? 'TitleBarContainer--active' : null,
+        isFullScreen ? 'TitleBarContainer--fullscreen' : null
       )}
     >
       <div className="TitleBarContainer__padding" />
       <div className="TitleBarContainer__content">{children}</div>
 
-      <TitleBar
-        className="TitleBarContainer__title"
-        platform="win32"
-        iconSrc={iconSrc}
-        theme={titleBarTheme}
-        maximized={isMaximized}
-        menu={maybeMenu}
-        onDoubleClick={titleBarDoubleClick}
-        hideControls
-      />
+      {!isFullScreen ? (
+        <TitleBar
+          className="TitleBarContainer__title"
+          platform="win32"
+          iconSrc={iconSrc}
+          theme={titleBarTheme}
+          maximized={isMaximized}
+          menu={maybeMenu}
+          onDoubleClick={titleBarDoubleClick}
+          hideControls
+        />
+      ) : null}
     </div>
   );
 };