diff --git a/share/completions/chsh.fish b/share/completions/chsh.fish
index 7608f017a..3cc238575 100644
--- a/share/completions/chsh.fish
+++ b/share/completions/chsh.fish
@@ -2,8 +2,8 @@
 # Completions for the chsh command
 #
 
-complete -c chsh -s s -l shell -x -a "(chsh -l)" -d "Specify your login shell"
-complete -c chsh -s l -l list-shells -d "Display the list of shells listed in /etc/shells and exit"
+# This grep tries to match nonempty lines that do not start with hash
+complete -c chsh -s s -l shell -x -a "(sgrep '^[^#]' /etc/shells)" -d "Specify your login shell"
 complete -c chsh -s u -l help -d "Display help and exit"
 complete -c chsh -s v -l version -d "Display version and exit"
 complete -x -c chsh -a "(__fish_complete_users)"