diff --git a/.config/i3/config b/.config/i3/config
index fceb329..2be0da4 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -244,7 +244,7 @@ exec --no-startup-id /usr/libexec/gnome-settings-daemon-localeexec
 exec --no-startup-id dconf write /org/gnome/settings-daemon/plugins/cursor/active false
 
 # Launch gnome-keyring
-exec --no-startup-id gnome-keyring-daemon
+exec --no-startup-id gnome-keyring-daemon --start
 
 # Focus should not follow mouse
 # This is sometimes usefull when picking colors on the screen in combination with deactivated dim
diff --git a/.zshenv b/.zshenv
index 8214b1f..b26e742 100644
--- a/.zshenv
+++ b/.zshenv
@@ -3,9 +3,8 @@
 
 setopt NO_GLOBAL_RCS
 
-if [ -n "$DESKTOP_SESSION" ]; then
-    eval $(/usr/bin/gnome-keyring-daemon --start)
-    export SSH_AUTH_SOCK
+if [ -n "$DESKTOP_SESSION" ] && [ -e /run/user/1000/keyring/ssh ]; then
+    export SSH_AUTH_SOCK=/run/user/1000/keyring/ssh
 fi
 
 export XDG_CONFIG_HOME="$HOME/.config"