diff --git a/lib/base/clicommand.cpp b/lib/base/clicommand.cpp
index 5f31ac524..bf1018526 100644
--- a/lib/base/clicommand.cpp
+++ b/lib/base/clicommand.cpp
@@ -208,7 +208,7 @@ void CLICommand::ShowCommands(int argc, char **argv, po::options_description *vi
 		if (autoindex < argc)
 			aword = argv[autoindex];
 
-		if (autoindex - 1 > best_match.size())
+		if (autoindex - 1 > best_match.size() && !command)
 			return;
 	} else
 		std::cout << "Supported commands: " << std::endl;