diff --git a/rc/modules/fzf-buffer.kak b/rc/modules/fzf-buffer.kak
index c1cc1e1..eb4242a 100644
--- a/rc/modules/fzf-buffer.kak
+++ b/rc/modules/fzf-buffer.kak
@@ -14,7 +14,7 @@ map global fzf -docstring "open buffer" 'b' '<esc>: fzf-buffer<ret>'
 
 define-command -hidden fzf-buffer %{ evaluate-commands %sh{
     buffers=$(mktemp ${TMPDIR:-/tmp}/kak-fzf-buffers.XXXXXX)
-    eval "set -- $kak_buflist"
+    eval "set -- $kak_quoted_quoted_buflist"
     while [ $# -gt 0 ]; do
         printf "%s\n" "$1" >> $buffers
         shift
diff --git a/rc/modules/fzf-yank-ring.kak b/rc/modules/fzf-yank-ring.kak
index 59b15bd..f0172de 100644
--- a/rc/modules/fzf-yank-ring.kak
+++ b/rc/modules/fzf-yank-ring.kak
@@ -20,7 +20,7 @@ hook global -once WinCreate .* %{ try %{
 
 define-command -hidden fzf-yank-ring %{ evaluate-commands %sh{
     yanks=$(mktemp ${TMPDIR:-/tmp}/kak-fzf-yanks.XXXXXX)
-    eval "set -- $kak_opt_yank_ring_history"
+    eval "set -- $kak_quoted_opt_yank_ring_history"
     while [ $# -gt 0 ]; do
         item=$(printf "%s" "$1" | sed "s/^'//;s/'$//" | awk 1 ORS='␤')
         printf "%s\n" "$item" >> $yanks