diff --git a/lib/extension/tree.js b/lib/extension/tree.js
index e9f2c7c..313f0f8 100644
--- a/lib/extension/tree.js
+++ b/lib/extension/tree.js
@@ -1217,6 +1217,7 @@ export class Tree extends Node {
 
     // If only a single tab remains, exit tabbed layout
     if (
+      this.settings.get_boolean("auto-exit-tabbed") &&
       parentNode.nodeType === NODE_TYPES.CON &&
       parentNode.layout === LAYOUT_TYPES.TABBED &&
       parentNode.childNodes.length === 1
diff --git a/lib/prefs/settings.js b/lib/prefs/settings.js
index 6bcce52..04d688f 100644
--- a/lib/prefs/settings.js
+++ b/lib/prefs/settings.js
@@ -119,6 +119,12 @@ export class SettingsPage extends PreferencesPage {
             { id: "stacked", name: _("Stacked") },
           ],
         }),
+        new SwitchRow({
+          title: _("Auto Exit Tabbed Tiling Mode"),
+          subtitle: _("Exit tabbed tiling mode when only a single tab remains"),
+          settings,
+          bind: "auto-exit-tabbed",
+        }),
         new SwitchRow({
           title: _("Auto Split"),
           subtitle: _("Quarter Tiling"),
diff --git a/schemas/org.gnome.shell.extensions.forge.gschema.xml b/schemas/org.gnome.shell.extensions.forge.gschema.xml
index 4e2ff19..ee42081 100644
--- a/schemas/org.gnome.shell.extensions.forge.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.forge.gschema.xml
@@ -127,6 +127,10 @@
             <default>true</default>
             <summary>Floating windows toggle always-on-top</summary>
         </key>
+        <key type="b" name="auto-exit-tabbed">
+            <default>true</default>
+            <summary>Exit tabbed tiling mode when only a single tab remains</summary>
+        </key>
         <key type="b" name="auto-split-enabled">
             <default>true</default>
             <summary>Enable auto split or quarter-tiling based based on smaller side</summary>