diff --git a/src/renderer/components/dock/dock-tabs.module.scss b/src/renderer/components/dock/dock-tabs.module.scss
index 502314b0e1..4a68a00c8a 100644
--- a/src/renderer/components/dock/dock-tabs.module.scss
+++ b/src/renderer/components/dock/dock-tabs.module.scss
@@ -15,6 +15,10 @@
   display: flex;
   overflow: hidden;
 
+  &:empty {
+    display: none;
+  }
+
   &:global(.scrollable) {
     overflow: auto;
     overflow-x: overlay;  /* Set scrollbar inside content area */
diff --git a/src/renderer/components/dock/dock.scss b/src/renderer/components/dock/dock.scss
index 75ef0790c8..27f8d8004b 100644
--- a/src/renderer/components/dock/dock.scss
+++ b/src/renderer/components/dock/dock.scss
@@ -57,6 +57,10 @@
       min-height: $unit * 4;
       padding-left: $padding;
       user-select: none;
+
+      &.pl-0 {
+        padding-left: 0;
+      }
     }
   }
 
diff --git a/src/renderer/components/dock/dock.tsx b/src/renderer/components/dock/dock.tsx
index 7f5f6f7322..9f2d1bbfe3 100644
--- a/src/renderer/components/dock/dock.tsx
+++ b/src/renderer/components/dock/dock.tsx
@@ -157,7 +157,7 @@ class NonInjectedDock extends React.Component<DockProps & Dependencies> {
             autoFocus={isOpen}
             onChangeTab={this.onChangeTab}
           />
-          <div className="toolbar flex gaps align-center box grow">
+          <div className={cssNames("toolbar flex gaps align-center box grow", { "pl-0": tabs.length == 0 })}>
             <div className="dock-menu box grow">
               <MenuActions usePortal triggerIcon={{ material: "add", className: "new-dock-tab", tooltip: "New tab" }} closeOnScroll={false}>
                 <MenuItem className="create-terminal-tab" onClick={() => this.props.createTerminalTab()}>