diff --git a/.bashrc b/.bashrc
index 4ebc101..99ad923 100644
--- a/.bashrc
+++ b/.bashrc
@@ -207,6 +207,7 @@ __ssh_agent_prompt_command() {
         return 1
       }
       printf "\\033[1;32;40m%s\\033[0;39m\\n" "Started new ssh-agent."
+      __write_ssh_agents
     fi
   }
   return 0
@@ -283,6 +284,7 @@ hash grep >/dev/null 2>&1 && {
 hash nc >/dev/null 2>&1 && alias pastebin='nc termbin.com 9999'
 
 # Auto start the ssh agent and add keys for scp/sftp/ssh.
+__ssh_agent_prompt_command
 hash scp ssh ssh-add >/dev/null 2>&1 && alias scp='_EXEC=scp ssh'
 hash sftp ssh ssh-add >/dev/null 2>&1 && alias sftp='_EXEC=sftp ssh'
 hash ssh ssh-add >/dev/null 2>&1 && ssh() {