diff --git a/.config/kak/autoload/util.kak b/.config/kak/autoload/util.kak
index c1657701..673dfcf9 100644
--- a/.config/kak/autoload/util.kak
+++ b/.config/kak/autoload/util.kak
@@ -15,9 +15,6 @@ insert-date -params 0.. %{
 alias global date insert-date
 
 define-command -params 2 \
--docstring %{
-    Swap all occurence of param A with param B in selections.
-} \
 swap %{
     evaluate-commands -save-regs | %{
         set-register | %exp{
@@ -28,6 +25,19 @@ swap %{
     }
 }
 
+define-command -params 2 \
+-docstring %{
+    Swap all occurence of param A with param B in selections.
+} \
+swap-buffer %{
+    evaluate-commands -save-regs "ab" -draft %{
+        set-register a %arg{1}
+        set-register b %arg{2}
+        execute-keys "<percent>s\Q<c-r>a\E|\Q<c-r>b\E<ret>"
+        swap "%arg{1}" "%arg{2}"
+    }
+}
+
 define-command regswap -params 2 %{
     evaluate-commands -draft -save-regs "abcd" %{
         set-register a %arg{1}