diff --git a/plugins/yubikey/yubikey.plugin.zsh b/plugins/yubikey/yubikey.plugin.zsh
index 11ccf48a1..7fff4f777 100644
--- a/plugins/yubikey/yubikey.plugin.zsh
+++ b/plugins/yubikey/yubikey.plugin.zsh
@@ -23,8 +23,8 @@ fi
 
 
 alias yubi-init="pkill ssh-agent; pkill gpg-agent; ssh-agent -s > $_sshpath; source $_sshpath"
-alias yubi-insert="ssh-add -s $OPENSC"
-alias yubi-eject="ssh-add -e $OPENSC"
+alias yubi-insert="ssh-add -s $OPENSC && ssh-add -L"
+alias yubi-eject="ssh-add -e $OPENSC && ssh-add -L"
 
 if [[ -r $_sshpath ]]; then
     echo -n "Common SSH Agent detected. "