diff --git a/pkg/util/autocomplete/autocomplete.go b/pkg/util/autocomplete/autocomplete.go
index 89624471..4da8ecbf 100644
--- a/pkg/util/autocomplete/autocomplete.go
+++ b/pkg/util/autocomplete/autocomplete.go
@@ -43,7 +43,7 @@ func Command(name string) *cobra.Command {
 			name, name, name, name, name, name, name, name, name, name),
 		DisableFlagsInUseLine: true,
 		ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-		Args:                  cobra.ExactValidArgs(1),
+		Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
 		Run: func(cmd *cobra.Command, args []string) {
 			switch args[0] {
 			case "bash":