diff --git a/src/python/jw/pkg/lib/App.py b/src/python/jw/pkg/lib/App.py
index 566c3691..98432d01 100644
--- a/src/python/jw/pkg/lib/App.py
+++ b/src/python/jw/pkg/lib/App.py
@@ -87,7 +87,7 @@ class App: # export
         log(DEBUG, '-------------- Running: >' + ' '.join(sys.argv) + '<')
 
         cmd_classes = LoadTypes(modules if modules else ['__main__'], type_name_filter=name_filter, type_filter=[Cmd])
-        add_all_parsers = '-h' in sys.argv or '--help' in sys.argv
+        add_all_parsers = '-h' in sys.argv or '--help' in sys.argv or '_ARGCOMPLETE' in os.environ
         add_cmds_to_parser(self, self.__parser, [cmd_class(self) for cmd_class in cmd_classes], all=add_all_parsers)
 
         # -- Add help only now, wouldn't want to have parse_known_args() exit on --help with subcommands missing