diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1d6e98597..dacc2a06c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,6 +35,12 @@ Added
   instance.
 - New setting `statusbar.url.fg.success.https` to set the foreground color for
   the URL when a page was loaded via HTTPS.
+- The scrollbar in the completion is now styled, and the following new options
+  got added:
+    * `completion -> scrollbar-width`
+    * `completion -> scrollbar-padding`
+    * `colors -> completion.scrollbar.fg`
+    * `colors -> completion.scrollbar.bg`
 
 Changed
 ~~~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index 9ee584709..7f1941703 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -144,10 +144,10 @@ Contributors, sorted by the number of commits in descending order:
 * Claude
 * Lamar Pavel
 * Daniel
+* Nathan Isom
 * Austin Anderson
 * Artur Shaik
 * Thorsten Wißmann
-* Nathan Isom
 * Alexey "Averrin" Nabrodov
 * meles5
 * ZDarian
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 2a8502bdd..bd0d9c35e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -78,6 +78,8 @@
 |<<completion-web-history-max-items,web-history-max-items>>|How many URLs to show in the web history.
 |<<completion-quick-complete,quick-complete>>|Whether to move on to the next part when there's only one possible completion left.
 |<<completion-shrink,shrink>>|Whether to shrink the completion to be smaller than the configured size if there are no scrollbars.
+|<<completion-scrollbar-width,scrollbar-width>>|Width of the scrollbar in the completion window (in px).
+|<<completion-scrollbar-padding,scrollbar-padding>>|Padding of scrollbar handle in completion window (in px).
 |==============
 
 .Quick reference for section ``input''
@@ -196,6 +198,8 @@
 |<<colors-completion.item.selected.border.top,completion.item.selected.border.top>>|Top border color of the completion widget category headers.
 |<<colors-completion.item.selected.border.bottom,completion.item.selected.border.bottom>>|Bottom border color of the selected completion item.
 |<<colors-completion.match.fg,completion.match.fg>>|Foreground color of the matched text in the completion.
+|<<colors-completion.scrollbar.fg,completion.scrollbar.fg>>|Color of the scrollbar handle in completion view.
+|<<colors-completion.scrollbar.bg,completion.scrollbar.bg>>|Color of the scrollbar in completion view
 |<<colors-statusbar.fg,statusbar.fg>>|Foreground color of the statusbar.
 |<<colors-statusbar.bg,statusbar.bg>>|Background color of the statusbar.
 |<<colors-statusbar.fg.error,statusbar.fg.error>>|Foreground color of the statusbar if there was an error.
@@ -833,6 +837,18 @@ Valid values:
 
 Default: +pass:[false]+
 
+[[completion-scrollbar-width]]
+=== scrollbar-width
+Width of the scrollbar in the completion window (in px).
+
+Default: +pass:[12]+
+
+[[completion-scrollbar-padding]]
+=== scrollbar-padding
+Padding of scrollbar handle in completion window (in px).
+
+Default: +pass:[2]+
+
 == input
 Options related to input modes.
 
@@ -1655,6 +1671,18 @@ Foreground color of the matched text in the completion.
 
 Default: +pass:[#ff4444]+
 
+[[colors-completion.scrollbar.fg]]
+=== completion.scrollbar.fg
+Color of the scrollbar handle in completion view.
+
+Default: +pass:[${completion.fg}]+
+
+[[colors-completion.scrollbar.bg]]
+=== completion.scrollbar.bg
+Color of the scrollbar in completion view
+
+Default: +pass:[${completion.bg}]+
+
 [[colors-statusbar.fg]]
 === statusbar.fg
 Foreground color of the statusbar.