diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 1c67fa6da..d5511dff0 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -52,7 +52,7 @@
 |<<colors.messages.info.border,colors.messages.info.border>>|Border color of an info message.
 |<<colors.messages.info.fg,colors.messages.info.fg>>|Foreground color an info message.
 |<<colors.messages.warning.bg,colors.messages.warning.bg>>|Background color of a warning message.
-|<<colors.messages.warning.border,colors.messages.warning.border>>|Border color of an error message.
+|<<colors.messages.warning.border,colors.messages.warning.border>>|Border color of a warning message.
 |<<colors.messages.warning.fg,colors.messages.warning.fg>>|Foreground color a warning message.
 |<<colors.prompts.bg,colors.prompts.bg>>|Background color for prompts.
 |<<colors.prompts.border,colors.prompts.border>>|Border used around UI elements in prompts.
@@ -951,7 +951,7 @@ Default: +pass:[darkorange]+
 
 [[colors.messages.warning.border]]
 === colors.messages.warning.border
-Border color of an error message.
+Border color of a warning message.
 
 Type: <<types,QssColor>>
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 54fefe29e..9f47a7d70 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1620,7 +1620,7 @@ colors.messages.warning.bg:
 colors.messages.warning.border:
   default: '#d47300'
   type: QssColor
-  desc: Border color of an error message.
+  desc: Border color of a warning message.
 
 colors.messages.info.fg:
   default: white