diff --git a/tabby-core/src/components/appRoot.component.pug b/tabby-core/src/components/appRoot.component.pug
index 1d9e737f..6155242d 100644
--- a/tabby-core/src/components/appRoot.component.pug
+++ b/tabby-core/src/components/appRoot.component.pug
@@ -1,5 +1,6 @@
 title-bar(
   *ngIf='ready && !hostWindow.isFullscreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
+  (dblclick)='hostWindow.toggleMaximize()',
   [class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullscreen'
 )
 
@@ -8,7 +9,7 @@ title-bar(
     [class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
     [class.tabs-on-side]='hasVerticalTabs()',
 )
-    .tab-bar
+    .tab-bar((dblclick)='hostWindow.toggleMaximize()')
         .inset.background(*ngIf='hostApp.platform == Platform.macOS \
         && !hostWindow.isFullscreen \
         && config.store.appearance.frame == "thin" \
diff --git a/tabby-core/src/components/tabHeader.component.ts b/tabby-core/src/components/tabHeader.component.ts
index 7a650321..2cf8780c 100644
--- a/tabby-core/src/components/tabHeader.component.ts
+++ b/tabby-core/src/components/tabHeader.component.ts
@@ -88,8 +88,9 @@ export class TabHeaderComponent extends BaseComponent {
         return this.config.store.appearance.flexTabs
     }
 
-    @HostListener('dblclick') onDoubleClick (): void {
+    @HostListener('dblclick', ['$event']) onDoubleClick ($event: MouseEvent): void {
         this.showRenameTabModal()
+        $event.stopPropagation()
     }
 
     @HostListener('mousedown', ['$event']) async onMouseDown ($event: MouseEvent) {