diff --git a/lib/completion.zsh b/lib/completion.zsh
index 2b62785d5..a3873cd08 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -1,7 +1,7 @@
 # fixme - the load process here seems a bit bizarre
 zmodload -i zsh/complist
 
-WORDCHARS=''
+WORDCHARS='_-'
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol