diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh
index 042e1a0330..3ffad63318 100644
--- a/modules/completion/init.zsh
+++ b/modules/completion/init.zsh
@@ -30,9 +30,6 @@ setopt AUTO_PARAM_SLASH    # If completed parameter is a directory, add a traili
 unsetopt MENU_COMPLETE     # Do not autoselect the first completion entry.
 unsetopt FLOW_CONTROL      # Disable start/stop characters in shell editor.
 
-# Treat these characters as part of a word.
-WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
-
 #
 # Styles
 #
diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index d76c605719..b905face3a 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -57,6 +57,9 @@ setopt BEEP
 # Variables
 #
 
+# Treat these characters as part of a word.
+WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
+
 # Use human-friendly identifiers.
 zmodload zsh/terminfo
 typeset -gA key_info