diff --git a/gen-go-code.py b/gen-go-code.py
index e317b5772..94f215ba4 100755
--- a/gen-go-code.py
+++ b/gen-go-code.py
@@ -95,6 +95,7 @@ def generate_completions_for_kitty() -> None:
     # The kitty exe
     print('k := root.AddSubCommand(&cli.Command{'
           'Name:"kitty", SubCommandIsOptional: true, ArgCompleter: cli.CompleteExecutableFirstArg, SubCommandMustBeFirst: true })')
+    print('kt := root.AddSubCommand(&cli.Command{Name:"kitty-tool", SubCommandMustBeFirst: true })')
     for opt in go_options_for_seq(parse_option_spec()[0]):
         print(opt.as_option('k'))
 
@@ -121,6 +122,7 @@ def generate_completions_for_kitty() -> None:
 
     # @
     print('at.EntryPoint(k)')
+    print('at.EntryPoint(kt)')
 
     # clone-in-kitty, edit-in-kitty
     print('cik := root.AddSubCommand(&cli.Command{Name:"clone-in-kitty"})')
diff --git a/kitty_tests/completion.py b/kitty_tests/completion.py
index ad184286c..57fa11194 100644
--- a/kitty_tests/completion.py
+++ b/kitty_tests/completion.py
@@ -148,6 +148,8 @@ def completion(self: TestCompletion, tdir: str):
     add('kitty @launch --cwd ', has_words('current', 'oldest', 'last_reported'))
     add('kitty @launch --logo ', all_words('exe-not3.png'))
     add('kitty @launch --logo ~', all_words('~/exe-not3.png'))
+    add('kitty-tool ', has_words('@', '@ls'))
+    add('kitty-tool @launch --ty', has_words('--type'))
 
     add('kitty + ', has_words('launch', 'kitten'))
     add('kitty + kitten ', has_words('icat', 'diff'))