diff --git a/.config/kak/autoload/fmt.kak b/.config/kak/autoload/fmt.kak
index 473e7361..917db8e7 100644
--- a/.config/kak/autoload/fmt.kak
+++ b/.config/kak/autoload/fmt.kak
@@ -51,7 +51,6 @@ define-command -hidden fmt-impl-window %{
                 # We use '' (U+E000) to save and restore the cursor
                 # position after the pipe.
                 execute-keys 'c<esc><a-i>p_<a-j>S\n+\z<ret>|<ret>s<ret>d"cP'
-                # execute-keys 'c<esc><a-i>p<a-j>S\n+\z<ret>|<ret>s<ret>d"cP'
 
                 set-register s "%val{selections_desc}"
             }
@@ -71,6 +70,12 @@ define-command -docstring "toggle autofmt at window scope" fmt-toggle-window %{
 }
 
 declare-option str fmt_info
-hook global User fmt-enable-window  %{ set-option window fmt_info "fmt " }
-hook global User fmt-disable-window %{ set-option window fmt_info "" }
+hook global User fmt-enable-window  %{
+    set-option window fmt_info "fmt "
+    info -title fmt 'enabled autowrap'
+}
+hook global User fmt-disable-window %{
+    set-option window fmt_info ""
+    info -title fmt 'disabled autowrap'
+}
 
diff --git a/.config/kak/autoload/ui-mode.kak b/.config/kak/autoload/ui-mode.kak
index 1d6ff742..f0707653 100644
--- a/.config/kak/autoload/ui-mode.kak
+++ b/.config/kak/autoload/ui-mode.kak
@@ -66,6 +66,7 @@ define-command autowrap-toggle -docstring "toggle autowrap" %{
 	}
 }
 
-map -docstring 'toggle autowrap' global ui a ": autowrap-toggle<ret>"
+# map -docstring 'toggle autowrap' global ui a ": autowrap-toggle<ret>"
+map -docstring 'toggle autowrap' global ui f ": fmt-toggle-window<ret>"
 map -docstring 'toggle autospell' global ui s ": autospell-toggle<ret>"
 ~