diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
index bf58a72ae..c3ae518df 100644
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@@ -89,7 +89,7 @@ function detect-clipboard() {
     function clipcopy() {
       local content_tocopy
       content_tocopy=$(cat "${1:-/dev/stdin}" | base64 | tr -d '\n')
-      printf "\033]52;c;%s\a" "$data" > /dev/tty
+      printf "\033]52;c;%s\a" "$content_tocopy" > /dev/tty
     }
     function clippaste() {
       echo "OSC 52 does not support pasting from the clipboard."
diff --git a/plugins/copybuffer/copybuffer.plugin.zsh b/plugins/copybuffer/copybuffer.plugin.zsh
index e636d9730..3238a2a6a 100644
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@@ -14,3 +14,4 @@ zle -N copybuffer
 bindkey -M emacs "^O" copybuffer
 bindkey -M viins "^O" copybuffer
 bindkey -M vicmd "^O" copybuffer
+bindkey -M vicmd "yy" copybuffer