diff --git a/rc/filetype/diff.kak b/rc/filetype/diff.kak
index 5be241f2..6d7ba695 100644
--- a/rc/filetype/diff.kak
+++ b/rc/filetype/diff.kak
@@ -43,7 +43,7 @@ define-command diff-jump -params .. -docstring %{
         }
         set-register a %arg{@}
         set-register | %{
-            [ -n "$kak_reg_a" ] && eval set -- $kak_quoted_reg_a
+            [ -n "$kak_reg_a" ] && eval set -- "$kak_quoted_reg_a"
             cmd=$(column=$kak_reg_c perl -we '
                 sub quote {
                     $SQ = "'\''";
diff --git a/rc/tools/patch.kak b/rc/tools/patch.kak
index a6bae1f6..2feb85b3 100644
--- a/rc/tools/patch.kak
+++ b/rc/tools/patch.kak
@@ -52,7 +52,7 @@ define-command patch -params .. -docstring %{
                 # Since registers are never empty, we get an empty arg even if
                 # there were no args. This does no harm because we pass it to
                 # a shell where it expands to nothing.
-                eval set -- $kak_quoted_reg_a
+                eval set -- "$kak_quoted_reg_a"
 
                 perl "${kak_reg_f%/*}/patch-range.pl" $min_line $max_line "$@" ||
                     echo >$kak_command_fifo "set-register e fail 'patch: failed to apply selections, see *debug* buffer'"