diff --git a/lib/cli/clicommand.cpp b/lib/cli/clicommand.cpp
index f35ddb77d..fab8657cf 100644
--- a/lib/cli/clicommand.cpp
+++ b/lib/cli/clicommand.cpp
@@ -233,6 +233,9 @@ void CLICommand::ShowCommands(int argc, char **argv, po::options_description *vi
 				continue;
 			}
 
+			if (autocomplete && i >= autoindex - 1)
+				break;
+
 			if (vname[i] != argv[k])
 				break;