diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 8007a81a..ee415dd9 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -124,17 +124,21 @@ map -docstring "commenct line" global normal <c-v> ":comment-line<ret>"
 declare-user-mode git
 map -docstring "git" global user g ": enter-user-mode git<ret>"
 map -docstring "lazygit kak cwd" global git g ": terminal lazygit<ret>"
-map -docstring "lazygit buffer directory" global git G %{
-    evaluate-commands terminal "lazygit -w %sh{
-        dirname "$kak_buffile"
-    }"
+
+define-command lazygit-buffer-dir %{
+    evaluate-commands %sh{
+        ROOT="$(env -C "$(dirname $kak_buffile)" git rev-parse --show-toplevel)"
+        printf "terminal lazygit -p %s" "$ROOT"
+    }
 }
-def git_blame %{
+map -docstring "lazygit buffer directory" global git G ": lazygit-buffer-dir<ret>"
+
+define-command git-blame %{
 	info %sh{
 		git -C $(dirname $(realpath $kak_buffile)) blame -L $kak_cursor_line,$kak_cursor_line $(realpath $kak_buffile)
 	}
 }
-map -docstring "blame" global git b ": git_blame"
+map -docstring "blame" global git b ": git-blame<ret>"
 
 map -docstring "format" global user F ": format<ret>"