diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish
index 88f82add..d705a63a 100644
--- a/.config/fish/conf.d/abbr.fish
+++ b/.config/fish/conf.d/abbr.fish
@@ -19,3 +19,4 @@ abbr -a hniri hx /home/fic/.config/niri/main.kdl
 abbr -a hbf hut builds show --follow
 abbr -a k kak
 abbr -a krc kak -e \'cd ~/.config/kak\' ~/.config/kak/kakrc
+abbr -a kakrc kak -e \'cd ~/.config/kak\' ~/.config/kak/kakrc
diff --git a/.config/kak/autoload/filetype.kak b/.config/kak/autoload/filetype.kak
index 2bcc6a61..c910e66c 100644
--- a/.config/kak/autoload/filetype.kak
+++ b/.config/kak/autoload/filetype.kak
@@ -13,8 +13,3 @@ hook global WinSetOption filetype=kak %{
     # set-option window expandtab false
 }
 
-hook global WinSetOption filetype=markdown %{
-	set-option window formatcmd "dprint fmt --stdin md"
-}
-
-
diff --git a/.config/kak/autoload/filetype/markdown.kak b/.config/kak/autoload/filetype/markdown.kak
new file mode 100644
index 00000000..8ef44db1
--- /dev/null
+++ b/.config/kak/autoload/filetype/markdown.kak
@@ -0,0 +1,9 @@
+hook global WinSetOption filetype=markdown %{
+	hook -group markdown-auto-format window BufWritePre .* format
+	set-option window formatcmd "dprint fmt --stdin md"
+
+	hook -once -always WinSetOption filetype=.* %{
+		unset-option window formatcmd
+		remove-hooks window markdown-auto-format
+	}
+}