diff --git a/.config/kak/autoload/filetype.kak b/.config/kak/autoload/filetype.kak
index 6b56f9bb..1a579c23 100644
--- a/.config/kak/autoload/filetype.kak
+++ b/.config/kak/autoload/filetype.kak
@@ -62,3 +62,12 @@ hook global WinSetOption filetype=man %{
 		}
 	}
 }
+
+hook global WinSetOption filetype=kdl %{
+    set-option window formatcmd "kdlfmt format -"
+    hook -group kdl-auto-format window BufWritePre .* format
+    hook -once -always WinSetOption filetype=.* %{
+        unset-option window formatcmd
+        remove-hooks window kdl-auto-format
+    }
+}
diff --git a/.config/kak/autoload/filetype/kdl.kak b/.config/kak/autoload/filetype/kdl.kak
index ef2e245c..b604fad8 100644
--- a/.config/kak/autoload/filetype/kdl.kak
+++ b/.config/kak/autoload/filetype/kdl.kak
@@ -3,7 +3,6 @@ hook global BufCreate .*[.](kdl) %{
 	set-option buffer comment_line "//"
 	set-option buffer comment_block_begin "/*"
 	set-option buffer comment_block_end "*/"
-	# set-option window formatcmd "kdlfmt format -"
 }
 
 hook global WinSetOption filetype=kdl %<