diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 99420c524b..c873252909 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Oct 27
+" Last Change:	2021 Dec 12
 
 " If there already is an option window, jump to that one.
 let buf = bufnr('option-window')
@@ -261,10 +261,8 @@ call <SID>OptionG("sect", &sect)
 call append("$", "path\tlist of directory names used for file searching")
 call append("$", "\t(global or local to buffer)")
 call <SID>OptionG("pa", &pa)
-if exists("+cdhome")
-  call <SID>AddOption("cdhome", "change directory to the home directory by :cd")
-  call <SID>BinOptionG("cdh", &cdh)
-endif
+call <SID>AddOption("cdhome", ":cd without argument goes to the home directory")
+call <SID>BinOptionG("cdh", &cdh)
 call append("$", "cdpath\tlist of directory names used for :cd")
 call <SID>OptionG("cd", &cd)
 if exists("+autochdir")
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index c0872f75bc..28b4eb9fe2 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -276,7 +276,7 @@ return {
     },
     {
       full_name='cdhome', abbreviation='cdh',
-      short_desc=N_("change directory to the home directory by :cd"),
+      short_desc=N_(":cd without argument goes to the home directory"),
       type='bool', scope={'global'},
       secure=true,
       varname='p_cdh',