diff --git a/rc/windowing/repl/x11.kak b/rc/windowing/repl/x11.kak
index 26dcd264..d7e6ed21 100644
--- a/rc/windowing/repl/x11.kak
+++ b/rc/windowing/repl/x11.kak
@@ -4,29 +4,28 @@ hook global ModuleLoaded x11 %{
 
 provide-module x11-repl %{
 
-# termcmd should already be set in x11.kak
+declare-option -docstring "window id of the REPL window" str x11_repl_id
+
 define-command -docstring %{
     x11-repl [<arguments>]: create a new window for repl interaction
     All optional parameters are forwarded to the new window
 } \
     -params .. \
     -shell-completion \
-    x11-repl %{ evaluate-commands %sh{
-        if [ -z "${kak_opt_termcmd}" ]; then
-           echo 'fail termcmd option is not set'
-           exit
-        fi
-        if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi
-        # The escape sequence in the printf command sets the terminal's title:
-        setsid ${kak_opt_termcmd} "printf '\e]2;kak_repl_window\a' \
-                && ${cmd}" < /dev/null > /dev/null 2>&1 &
-}}
+    x11-repl %{ x11-terminal sh -c %{
+        winid="${WINDOWID:-$(xdotool search --pid ${PPID} | tail -1)}"
+        printf "evaluate-commands -try-client $1 \
+            'set-option current x11_repl_id ${winid}'" | kak -p "$2"
+        shift 2;
+        [ "$1" ] && "$@" || "$SHELL"
+    } -- %val{client} %val{session} %arg{@}
+}
 
 define-command x11-send-text -docstring "send the selected text to the repl window" %{
     evaluate-commands %sh{
         printf %s\\n "${kak_selection}" | xsel -i ||
         echo 'fail x11-send-text: failed to run xsel, see *debug* buffer for details' &&
-        xdotool search --name kak_repl_window key --clearmodifiers Shift+Insert ||
+        xdotool windowactivate "${kak_opt_x11_repl_id}" key --clearmodifiers Shift+Insert ||
         echo 'fail x11-send-text: failed to run xdotool, see *debug* buffer for details'
     }
 }