diff --git a/rc/extra/kitty.kak b/rc/extra/kitty.kak
index 389330167..73c0b9e2f 100644
--- a/rc/extra/kitty.kak
+++ b/rc/extra/kitty.kak
@@ -7,9 +7,13 @@ hook global KakBegin .* %sh{
     fi
 }
 
-define-command -params .. kitty-new %{
-    nop %sh{ kitty @ new-window "$(command -v kak 2>/dev/null)" -c "${kak_session}" -e "$*" }
-}
+define-command -docstring %{kitty-new [<command>]: create a new kak client for the current session
+Optional arguments are passed as arguments to the new client} \
+    -params .. \
+    -command-completion \
+    kitty-new %{ nop %sh{
+        kitty @ new-window --no-response "$(command -v kak 2>/dev/null)" -c "${kak_session}" -e "$*"
+}}
 
 define-command -params ..1 -client-completion \
     -docstring %{kitty-focus [<client>]: focus the given client
@@ -18,7 +22,7 @@ If no client is passed then the current one is used} \
         if [ $# -eq 1 ]; then
             printf %s\\n "evaluate-commands -client '$1' focus"
         else
-            kitty @ focus-window -m=id:$kak_client_env_KITTY_WINDOW_ID
+            kitty @ focus-window --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID
         fi
     }
 }