diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 3e25d3ea17f9c8ed58094fec3b1973ceffd9279a..7b98ae48f0bfee97b054a13865c146819e839aa9 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -130,7 +130,7 @@ __perf_main ()
 	# Skip options backward and find the last perf command
 	__perf_prev_skip_opts
 	# List perf subcommands or long options
-	if [ $cword -eq 1 ]; then
+	if [ -z $prev_skip_opts ]; then
 		if [[ $cur == --* ]]; then
 			cmds=$($cmd --list-opts)
 		else