diff --git a/completers/wezterm_completer/cmd/cli.go b/completers/wezterm_completer/cmd/cli.go
index e5ddbb7a9a..06c3f80c55 100644
--- a/completers/wezterm_completer/cmd/cli.go
+++ b/completers/wezterm_completer/cmd/cli.go
@@ -19,6 +19,4 @@ func init() {
 	cliCmd.Flags().Bool("no-auto-start", false, "Don't automatically start the server")
 	cliCmd.Flags().Bool("prefer-mux", false, "Prefer connecting to a background mux server")
 	rootCmd.AddCommand(cliCmd)
-
-	// TODO subcommands
 }
diff --git a/completers/wezterm_completer/cmd/cli_activateTab.go b/completers/wezterm_completer/cmd/cli_activateTab.go
index f1acb74298..4ee5f2d2a1 100644
--- a/completers/wezterm_completer/cmd/cli_activateTab.go
+++ b/completers/wezterm_completer/cmd/cli_activateTab.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/wezterm"
 	"github.com/spf13/cobra"
 )
 
@@ -22,5 +23,9 @@ func init() {
 	cli_activateTabCmd.Flags().String("tab-relative", "", "Specify the target tab by its relative offset")
 	cliCmd.AddCommand(cli_activateTabCmd)
 
-	// TODO completion
+	carapace.Gen(cli_activateTabCmd).FlagCompletion(carapace.ActionMap{
+		"pane-id": wezterm.ActionPanes(),
+		"tab-id":  wezterm.ActionTabs(),
+		// TODO more flags
+	})
 }
diff --git a/completers/wezterm_completer/cmd/cli_setTabTitle.go b/completers/wezterm_completer/cmd/cli_setTabTitle.go
index b93015375e..b21a1bb35a 100644
--- a/completers/wezterm_completer/cmd/cli_setTabTitle.go
+++ b/completers/wezterm_completer/cmd/cli_setTabTitle.go
@@ -22,6 +22,6 @@ func init() {
 
 	carapace.Gen(cli_setTabTitleCmd).FlagCompletion(carapace.ActionMap{
 		"pane-id": wezterm.ActionPanes(),
-		// TODO tab-id
+		"tab-id":  wezterm.ActionTabs(),
 	})
 }
diff --git a/completers/wezterm_completer/cmd/cli_setWindowTitle.go b/completers/wezterm_completer/cmd/cli_setWindowTitle.go
index 16afcff585..d4a24ef207 100644
--- a/completers/wezterm_completer/cmd/cli_setWindowTitle.go
+++ b/completers/wezterm_completer/cmd/cli_setWindowTitle.go
@@ -21,7 +21,7 @@ func init() {
 	cliCmd.AddCommand(cli_setWindowTitleCmd)
 
 	carapace.Gen(cli_setWindowTitleCmd).FlagCompletion(carapace.ActionMap{
-		"pane-id": wezterm.ActionPanes(),
-		// TODO window
+		"pane-id":   wezterm.ActionPanes(),
+		"window-id": wezterm.ActionWindows(),
 	})
 }