diff --git a/config.c b/config.c
index cc5e726b..d949f423 100644
--- a/config.c
+++ b/config.c
@@ -1860,8 +1860,14 @@ void setup_config_box(struct controlbox *b, int midsession,
 		      "Normal", 'n', I(0),
 		      "Rectangular block", 'r', I(1), NULL);
 
-    s = ctrl_getset(b, "Window/Selection", "charclass",
-		    "Control the select-one-word-at-a-time mode");
+    /*
+     * The Window/Selection/Words panel.
+     */
+    ctrl_settitle(b, "Window/Selection/Words",
+                  "Options controlling word-by-word selection");
+
+    s = ctrl_getset(b, "Window/Selection/Words", "charclass",
+		    "Classes of character that group together");
     ccd = (struct charclass_data *)
 	ctrl_alloc(b, sizeof(struct charclass_data));
     ccd->listbox = ctrl_listbox(s, "Character classes:", 'e',
diff --git a/doc/config.but b/doc/config.but
index 7ad5e282..c4a7b9ef 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1469,14 +1469,16 @@ select a rectangular block. Using the \q{Default selection mode}
 control, you can set \i{rectangular selection} as the default, and then
 you have to hold down Alt to get the \e{normal} behaviour.
 
-\S{config-charclasses} Configuring \i{word-by-word selection}
+\H{config-selection-words} The Words panel
+
+PuTTY will \I{word-by-word selection}select a word at a time in the
+terminal window if you \i{double-click} to begin the drag. This panel
+allows you to control precisely what is considered to be a word.
+
+\S{config-charclasses} Character classes
 
 \cfg{winhelp-topic}{selection.charclasses}
 
-PuTTY will select a word at a time in the terminal window if you
-\i{double-click} to begin the drag. This panel allows you to control
-precisely what is considered to be a word.
-
 Each character is given a \e{class}, which is a small number
 (typically 0, 1 or 2). PuTTY considers a single word to be any
 number of adjacent characters in the same class. So by modifying the