diff --git a/source/changelog.lisp b/source/changelog.lisp
index 82b8738a5d2..4239b5528e9 100644
--- a/source/changelog.lisp
+++ b/source/changelog.lisp
@@ -814,7 +814,9 @@ buffers.")
    (:li "Add commands for importing history from other browsers.
 Currently, the supported browsers are Firefox, Google Chrome,
 Chromium, Brave and Vivaldi.")
-   (:li "Add Public Sans font and set it as the default.")))
+   (:li "Add Public Sans font and set it as the default.")
+   (:li "Fix keyscheme configuration via "
+          (:a :href (nyxt-url 'common-settings) "Common Settings Menu") ".")))
 
 (define-version "4-pre-release-1"
   (:li "When on pre-release, push " (:code "X-pre-release")
diff --git a/source/help.lisp b/source/help.lisp
index c78bdcee490..14b5e92714b 100644
--- a/source/help.lisp
+++ b/source/help.lisp
@@ -60,24 +60,27 @@ to the next."
 Nyxt session to the next.
 
 Note that some settings may require restarting Nyxt to take effect.")
-    (:h2 "Keybinding style")
+    (:h2 "Keyscheme (keyboard shortcuts)")
     (:nselect
-      :id "keybinding-style"
+      :id "keyscheme"
       :buffer buffer
-      '((cua "Use default (CUA)")
+      '((cua "CUA (default)")
         (nyxt::auto-configure
-         :form '(define-configuration web-buffer
+         :form '(define-configuration (web-buffer prompt-buffer
+                                       panel-buffer nyxt/mode/editor:editor-buffer)
                  ((default-modes (remove-if (lambda (m)
                                               (find (symbol-name (name m))
                                                     '("EMACS-MODE" "VI-NORMAL-MODE" "VI-INSERT-MODE")))
                                   %slot-value%))))))
-      '((emacs "Use Emacs")
+      '((emacs "Emacs")
         (nyxt::auto-configure
-         :form '(define-configuration web-buffer
+         :form '(define-configuration (web-buffer prompt-buffer
+                                       panel-buffer nyxt/mode/editor:editor-buffer)
                  ((default-modes (pushnew 'nyxt/mode/emacs:emacs-mode %slot-value%))))))
-      '((vi "Use vi")
+      '((vi "VI")
         (nyxt::auto-configure
-         :form '(define-configuration web-buffer
+         :form '(define-configuration (web-buffer prompt-buffer
+                                       panel-buffer nyxt/mode/editor:editor-buffer)
                  ((default-modes (pushnew 'nyxt/mode/vi:vi-normal-mode %slot-value%)))))))
     (flet ((generate-colors (theme-symbol text)
              (spinneret:with-html-string