diff --git a/rc/windowing/iterm.kak b/rc/windowing/iterm.kak
index d99a975c9..02045f138 100644
--- a/rc/windowing/iterm.kak
+++ b/rc/windowing/iterm.kak
@@ -136,7 +136,7 @@ If no client is passed then the current one is used' \
         fi
     }
 }
-complete-command iterm-focus client
+complete-command -menu iterm-focus client
 
 alias global focus iterm-focus
 alias global terminal iterm-terminal-vertical
diff --git a/rc/windowing/kitty.kak b/rc/windowing/kitty.kak
index 1e4880dc7..64cc224ed 100644
--- a/rc/windowing/kitty.kak
+++ b/rc/windowing/kitty.kak
@@ -72,7 +72,7 @@ If no client is passed then the current one is used' \
         fi
     }
 }
-complete-command kitty-focus client
+complete-command -menu kitty-focus client
 
 alias global terminal kitty-terminal
 alias global terminal-tab kitty-terminal-tab
diff --git a/rc/windowing/new-client.kak b/rc/windowing/new-client.kak
index e017344e5..214a18e36 100644
--- a/rc/windowing/new-client.kak
+++ b/rc/windowing/new-client.kak
@@ -6,4 +6,4 @@ The optional arguments are passed as commands to the new client' \
     terminal kak -c %val{session} -e "%arg{@}"
 }
 
-complete-command new command
+complete-command -menu new command
diff --git a/rc/windowing/screen.kak b/rc/windowing/screen.kak
index 8e4b6ee56..f90508869 100644
--- a/rc/windowing/screen.kak
+++ b/rc/windowing/screen.kak
@@ -72,7 +72,7 @@ If no client is passed then the current one is used' \
         fi
     }
 }
-complete-command screen-focus client 
+complete-command -menu screen-focus client 
 
 alias global focus screen-focus
 alias global terminal screen-terminal-vertical
diff --git a/rc/windowing/sway.kak b/rc/windowing/sway.kak
index dc0c5830c..4df122409 100644
--- a/rc/windowing/sway.kak
+++ b/rc/windowing/sway.kak
@@ -43,7 +43,7 @@ If no client is passed, then the current client is used' \
         fi
     }
 }
-complete-command sway-focus client
+complete-command -menu sway-focus client
 
 unalias global focus
 alias global focus sway-focus
diff --git a/rc/windowing/tmux.kak b/rc/windowing/tmux.kak
index fe656cc26..f5a8fda3a 100644
--- a/rc/windowing/tmux.kak
+++ b/rc/windowing/tmux.kak
@@ -71,7 +71,7 @@ If no client is passed then the current one is used' \
         fi
     }
 }
-complete-command tmux-focus client
+complete-command -menu tmux-focus client
 
 ## The default behaviour for the `new` command is to open an horizontal pane in a tmux session
 alias global focus tmux-focus
diff --git a/rc/windowing/wayland.kak b/rc/windowing/wayland.kak
index 1f595a33a..ea8de71d9 100644
--- a/rc/windowing/wayland.kak
+++ b/rc/windowing/wayland.kak
@@ -51,7 +51,7 @@ If no client is passed, then the current client is used' \
 %{
     fail 'Focusing specific windows in most Wayland window managers is unsupported'
 }
-complete-command wayland-focus client
+complete-command -menu wayland-focus client
 
 alias global focus wayland-focus
 alias global terminal wayland-terminal
diff --git a/rc/windowing/x11.kak b/rc/windowing/x11.kak
index 4c39f7bac..a6f7da876 100644
--- a/rc/windowing/x11.kak
+++ b/rc/windowing/x11.kak
@@ -63,7 +63,7 @@ If no client is passed, then the current client is used' \
         fi
     }
 }
-complete-command x11-focus client 
+complete-command -menu x11-focus client 
 
 alias global focus x11-focus
 alias global terminal x11-terminal