diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index ca72e149..d0f60d0e 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -77,6 +77,22 @@ define-command ui-scrolloff-toggle -docstring "toggle scrolloff" %{
 
 map global ui z ": ui-scrolloff-toggle<ret>"
 
+declare-option bool autowrap false
+
+define-command autowrap-toggle -docstring "toggle autowrap" %{
+  evaluate-commands %sh{
+    if [ "$kak_opt_autowrap" = "true" ]; then
+    echo "autowrap-disable"
+    echo "set-option window autowrap false"
+    else
+    echo "autowrap-enable"
+    echo "set-option window autowrap true"
+    fi
+  }
+}
+
+map global ui a ": autowrap-toggle<ret>"
+
 hook global WinCreate .* %{
 	ui-wrap-enable
 	ui-scrolloff-toggle