diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8c63de871..282f776fc 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,9 @@ Added
   size/padding of the tabbar.
 - New setting `network -> referer-header` to configure when the referer should
   be sent (by default it's only sent while on the same domain).
+- New setting `tabs -> show` which supersedes the old `tabs -> hide-*` options
+  and has an additional `switching` option which shows tab while switching
+  them. There's also a new `show-switching` option to configure the timeout.
 
 Changed
 ~~~~~~~
@@ -52,6 +55,8 @@ Removed
 
 - The `tabs -> indicator-space` setting got removed as the new padding settings
   should be used instead.
+- The `tabs -> hide-always` and `tabs -> hide-auto` settings got merged into
+  the new `tabs -> show` setting.
 
 v0.3.0
 ------
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 62593eacd..cd11988b8 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -102,8 +102,8 @@
 |<<tabs-new-tab-position,new-tab-position>>|How new tabs are positioned.
 |<<tabs-new-tab-position-explicit,new-tab-position-explicit>>|How new tabs opened explicitly are positioned.
 |<<tabs-last-close,last-close>>|Behavior when the last tab is closed.
-|<<tabs-hide-auto,hide-auto>>|Hide the tab bar if only one tab is open.
-|<<tabs-hide-always,hide-always>>|Always hide the tab bar.
+|<<tabs-show,show>>|When to show the tab bar
+|<<tabs-show-switching-delay,show-switching-delay>>|Time to show the tab bar before hiding it when tabs->show is set to 'switching'.
 |<<tabs-wrap,wrap>>|Whether to wrap when changing tabs.
 |<<tabs-movable,movable>>|Whether tabs should be movable.
 |<<tabs-close-mouse-button,close-mouse-button>>|On which mouse button to close tabs.
@@ -961,27 +961,24 @@ Valid values:
 
 Default: +pass:[ignore]+
 
-[[tabs-hide-auto]]
-=== hide-auto
-Hide the tab bar if only one tab is open.
+[[tabs-show]]
+=== show
+When to show the tab bar
 
 Valid values:
 
- * +true+
- * +false+
+ * +always+: Always show the tab bar.
+ * +never+: Always hide the tab bar.
+ * +multiple+: Hide the tab bar if only one tab is open.
+ * +switching+: Show the tab bar when switching tabs.
 
-Default: +pass:[false]+
+Default: +pass:[always]+
 
-[[tabs-hide-always]]
-=== hide-always
-Always hide the tab bar.
+[[tabs-show-switching-delay]]
+=== show-switching-delay
+Time to show the tab bar before hiding it when tabs->show is set to 'switching'.
 
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[false]+
+Default: +pass:[800]+
 
 [[tabs-wrap]]
 === wrap