diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index edb60aa34..518381187 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -205,7 +205,7 @@
 |<<hints.prev_regexes,hints.prev_regexes>>|Comma-separated list of regular expressions to use for 'prev' links.
 |<<hints.scatter,hints.scatter>>|Scatter hint key chains (like Vimium) or not (like dwb).
 |<<hints.uppercase,hints.uppercase>>|Make characters in hint strings uppercase.
-|<<history_gap_interval,history_gap_interval>>|Maximum time (in minutes) between two history items for them to be considered being from the same browsing session.
+|<<history.gap_interval,history.gap_interval>>|Maximum time (in minutes) between two history items for them to be considered being from the same browsing session.
 |<<input.escape_quits_reporter,input.escape_quits_reporter>>|Allow Escape to quit the crash reporter.
 |<<input.forward_unbound_keys,input.forward_unbound_keys>>|Which unbound keys to forward to the webview in normal mode.
 |<<input.insert_mode.auto_enter,input.insert_mode.auto_enter>>|Enter insert mode if an editable element is clicked.
@@ -2509,8 +2509,8 @@ Type: <<types,Bool>>
 
 Default: +pass:[false]+
 
-[[history_gap_interval]]
-=== history_gap_interval
+[[history.gap_interval]]
+=== history.gap_interval
 Maximum time (in minutes) between two history items for them to be considered being from the same browsing session.
 Items with less time between them are grouped when being displayed in `:history`. Use -1 to disable separation.
 
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index ee33d7897..401eb2bb9 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -275,7 +275,7 @@ def qute_history(url):
         return 'text/html', jinja.render(
             'history.html',
             title='History',
-            gap_interval=config.val.history_gap_interval
+            gap_interval=config.val.history.gap_interval
         )
 
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 7d39bded8..e7696dc93 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -23,16 +23,6 @@ confirm_quit:
   default: [never]
   desc: Require a confirmation before quitting the application.
 
-history_gap_interval:
-  type: Int
-  default: 30
-  desc: >-
-    Maximum time (in minutes) between two history items for them to be
-    considered being from the same browsing session.
-
-    Items with less time between them are grouped when being displayed in
-    `:history`. Use -1 to disable separation.
-
 ignore_case:
   renamed: search.ignore_case
 
@@ -1050,6 +1040,21 @@ hints.uppercase:
   type: Bool
   desc: Make characters in hint strings uppercase.
 
+## history
+
+history_gap_interval:
+  renamed: history.gap_interval
+
+history.gap_interval:
+  type: Int
+  default: 30
+  desc: >-
+    Maximum time (in minutes) between two history items for them to be
+    considered being from the same browsing session.
+
+    Items with less time between them are grouped when being displayed in
+    `:history`. Use -1 to disable separation.
+
 ## input
 
 input.escape_quits_reporter: