diff --git a/rc/core/formatter.kak b/rc/core/formatter.kak
index 8dbbf42f3..2af8eef2b 100644
--- a/rc/core/formatter.kak
+++ b/rc/core/formatter.kak
@@ -2,11 +2,12 @@ decl str formatcmd ""
 def format -docstring "Format the entire buffer with an external utility" %{
     %sh{
         if [ ! -z "${kak_opt_formatcmd}" ]; then
+            readonly kak_opt_formatcmd=$(printf '%s' "${kak_opt_formatcmd}" | sed 's/ /<space>/g')
             ## Save the current position of the cursor
             readonly x=$((kak_cursor_column - 1))
             readonly y="${kak_cursor_line}"
 
-            printf %s\\n "exec -draft %{%|${kak_opt_formatcmd// /<space>}<ret>}"
+            printf %s\\n "exec -draft %{%|${kak_opt_formatcmd}<ret>}"
             ## Try to restore the position of the cursor as it was prior to formatting
             printf %s\\n "exec gg ${y}g ${x}l"
         fi