diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts
index 5cedf58faa..8d2ff61cc5 100644
--- a/src/main/window-manager.ts
+++ b/src/main/window-manager.ts
@@ -86,6 +86,7 @@ export class WindowManager extends Singleton {
         minWidth: 700,  // accommodate 800 x 600 display minimum
         minHeight: 500, // accommodate 800 x 600 display minimum
         titleBarStyle: isWindows ? "hidden" : "hiddenInset",
+        autoHideMenuBar: true,
         backgroundColor: "#1e2124",
         webPreferences: {
           nodeIntegration: true,
diff --git a/src/renderer/components/layout/__tests__/topbar-linux.test.tsx b/src/renderer/components/layout/__tests__/topbar-linux.test.tsx
index f3ed0b0a04..0d22fca5ab 100644
--- a/src/renderer/components/layout/__tests__/topbar-linux.test.tsx
+++ b/src/renderer/components/layout/__tests__/topbar-linux.test.tsx
@@ -47,13 +47,7 @@ describe("<Tobar/> in Linux", () => {
     TopBarRegistry.resetInstance();
   });
 
-  it("shows menu icon", () => {
-    const { getByTestId } = render(<TopBar/>);
-
-    expect(getByTestId("window-menu")).toBeInTheDocument();
-  });
-
-  it("doesn't show windows title buttons", () => {
+  it("doesn't show custom title buttons used in Windows", () => {
     const { queryByTestId } = render(<TopBar/>);
 
     expect(queryByTestId("window-minimize")).not.toBeInTheDocument();
diff --git a/src/renderer/components/layout/topbar.module.css b/src/renderer/components/layout/topbar.module.css
index 495b6b6319..4534c89231 100644
--- a/src/renderer/components/layout/topbar.module.css
+++ b/src/renderer/components/layout/topbar.module.css
@@ -33,6 +33,10 @@
   -webkit-app-region: drag;
 }
 
+:global(.is-mac) .topBar {
+  padding-left: var(--hotbar-width);
+}
+
 .winMenu {
   width: var(--hotbar-width);
 
diff --git a/src/renderer/components/layout/topbar.tsx b/src/renderer/components/layout/topbar.tsx
index 8f8b0e35b3..4eeaae5a10 100644
--- a/src/renderer/components/layout/topbar.tsx
+++ b/src/renderer/components/layout/topbar.tsx
@@ -31,7 +31,7 @@ import { watchHistoryState } from "../../remote-helpers/history-updater";
 import { isActiveRoute, navigate } from "../../navigation";
 import { catalogRoute, catalogURL } from "../../../common/routes";
 import { IpcMainWindowEvents } from "../../../main/window-manager";
-import { isLinux, isWindows } from "../../../common/vars";
+import { isWindows } from "../../../common/vars";
 
 interface Props extends React.HTMLAttributes<any> {
 }
@@ -125,13 +125,13 @@ export const TopBar = observer(({ children, ...rest }: Props) => {
   return (
     <div className={styles.topBar} onDoubleClick={windowSizeToggle} ref={elem} {...rest}>
       <div className={styles.tools}>
-        <div className={styles.winMenu}>
-          {(isWindows || isLinux) && (
+        {isWindows && (
+          <div className={styles.winMenu}>
             <div onClick={openContextMenu} data-testid="window-menu">
               <svg width="12" height="12" viewBox="0 0 12 12" shapeRendering="crispEdges"><path fill="currentColor" d="M0,8.5h12v1H0V8.5z"/><path fill="currentColor" d="M0,5.5h12v1H0V5.5z"/><path fill="currentColor" d="M0,2.5h12v1H0V2.5z"/></svg>
             </div>
-          )}
-        </div>
+          </div>
+        )}
         <Icon
           data-testid="home-button"
           material="home"