diff --git a/completions/pyenv.fish b/completions/pyenv.fish
index bf18b2a2..4d2d51d6 100644
--- a/completions/pyenv.fish
+++ b/completions/pyenv.fish
@@ -18,5 +18,6 @@ end
 
 complete -f -c pyenv -n '__fish_pyenv_needs_command' -a '(pyenv commands)'
 for cmd in (pyenv commands)
-  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a "(pyenv completions $cmd)"
+  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a \
+    "(pyenv completions (commandline -opc)[2..-1])"
 end