diff --git a/rc/tools/git.kak b/rc/tools/git.kak
index d9a603e5..bbe8d65f 100644
--- a/rc/tools/git.kak
+++ b/rc/tools/git.kak
@@ -166,16 +166,16 @@ define-command -params 1.. \
         mkfifo ${output}
         ( git "$@" > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
 
-        printf %s "evaluate-commands -try-client '$kak_opt_docsclient' '
+        printf %s "evaluate-commands -try-client '$kak_opt_docsclient' %{
                   edit! -fifo ${output} *git*
                   set-option buffer filetype ${filetype}
                   $(hide_blame)
                   set-option buffer git_blob %{}
-                  hook -always -once buffer BufCloseFifo .* ''
+                  hook -always -once buffer BufCloseFifo .* %{
                       nop %sh{ rm -r $(dirname ${output}) }
-                      $(printf %s "${on_close_fifo}" | sed "s/'/''''/g")
-                  ''
-        '"
+                      $(printf %s "${on_close_fifo}" | sed s/\'/\'\'/g)
+                  }
+        }"
     }
 
     hide_blame() {