diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm
index 5e642607..37b8bd73 100644
--- a/Frameworks/DocumentWindow/src/DocumentController.mm
+++ b/Frameworks/DocumentWindow/src/DocumentController.mm
@@ -1000,7 +1000,7 @@ namespace
 		}
 		[self closeTabsAtIndexes:indexSet askToSaveChanges:YES createDocumentIfEmpty:NO];
 	}
-	else
+	else if(![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableTabAutoCloseKey])
 	{
 		NSInteger excessTabs = _documents.size() - std::max<NSUInteger>(self.tabBarView.countOfVisibleTabs, 8);
 		if(self.tabBarView && excessTabs > 0)
diff --git a/Frameworks/Preferences/src/Keys.h b/Frameworks/Preferences/src/Keys.h
index 50c19664..cc6bc6d6 100644
--- a/Frameworks/Preferences/src/Keys.h
+++ b/Frameworks/Preferences/src/Keys.h
@@ -31,6 +31,7 @@ PUBLIC extern NSString* const kUserDefaultsDisableFileBrowserWindowResizeKey;
 PUBLIC extern NSString* const kUserDefaultsAutoRevealFileKey;
 PUBLIC extern NSString* const kUserDefaultsAllowExpandingLinksKey;
 PUBLIC extern NSString* const kUserDefaultsDisableTabReorderingKey;
+PUBLIC extern NSString* const kUserDefaultsDisableTabAutoCloseKey;
 
 // ===========
 // = Bundles =
diff --git a/Frameworks/Preferences/src/Keys.mm b/Frameworks/Preferences/src/Keys.mm
index fbe05c50..7d9411e8 100644
--- a/Frameworks/Preferences/src/Keys.mm
+++ b/Frameworks/Preferences/src/Keys.mm
@@ -71,6 +71,7 @@ NSString* const kUserDefaultsTabsAboveDocumentKey              = @"tabsAboveDocu
 NSString* const kUserDefaultsDisableFileBrowserWindowResizeKey = @"disableFileBrowserWindowResize";
 NSString* const kUserDefaultsAutoRevealFileKey                 = @"autoRevealFile";
 NSString* const kUserDefaultsDisableTabReorderingKey           = @"disableTabReordering";
+NSString* const kUserDefaultsDisableTabAutoCloseKey            = @"disableTabAutoClose";
 NSString* const kUserDefaultsAllowExpandingLinksKey            = @"allowExpandingLinks";
 
 // ===========