2 files changed, 10 insertions, 0 deletions
diff --git a/macosx/HBController.m b/macosx/HBController.m
index 2b64afaaa..af4d88b45 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -211,6 +211,11 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
 
 - (void)windowDidLoad
 {
+    if (@available (macOS 10.12, *))
+    {
+        self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+    }
+
     [self enableUI:NO];
 
     // Bottom
diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index dfe824409..f42067f6c 100644
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -112,6 +112,11 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
 
 - (void)windowDidLoad
 {
+    if (@available (macOS 10.12, *))
+    {
+        self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+    }
+
     // lets setup our queue list table view for drag and drop here
     [self.tableView registerForDraggedTypes:@[DragDropSimplePboardType]];
     [self.tableView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];