diff --git a/emain/emain.ts b/emain/emain.ts
index 3bd5cc3e7..27d1db865 100644
--- a/emain/emain.ts
+++ b/emain/emain.ts
@@ -332,7 +332,14 @@ function createBrowserWindow(
     };
     winBounds = ensureBoundsAreVisible(winBounds);
     const winOpts: Electron.BrowserWindowConstructorOptions = {
-        titleBarStyle: "hiddenInset",
+        titleBarStyle: unamePlatform === "darwin" ? "hiddenInset" : "hidden",
+        titleBarOverlay:
+            unamePlatform !== "darwin"
+                ? {
+                      symbolColor: "white",
+                      color: "#00000000",
+                  }
+                : false,
         x: winBounds.x,
         y: winBounds.y,
         width: winBounds.width,
diff --git a/frontend/app/tab/tabbar.less b/frontend/app/tab/tabbar.less
index 72ed5ccd9..b431b5ca5 100644
--- a/frontend/app/tab/tabbar.less
+++ b/frontend/app/tab/tabbar.less
@@ -17,6 +17,7 @@
     user-select: none;
     display: flex;
     flex-direction: row;
+    width: env(titlebar-area-width);
 
     .tabs-wrapper {
         transition: var(--tabs-wrapper-transition);