diff --git a/data/start-cosmic b/data/start-cosmic
index c85c2d2..b7b12f9 100755
--- a/data/start-cosmic
+++ b/data/start-cosmic
@@ -40,9 +40,15 @@ if command -v systemctl >/dev/null; then
     # set environment variables for new units started by user service manager
     systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
 fi
+
+SSH_AGENT=""
+if [ -x /usr/bin/ssh-agent ]; then
+  SSH_AGENT=/usr/bin/ssh-agent
+fi
+
 # Run cosmic-session
 if [[ -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
-    exec /usr/bin/dbus-run-session -- /usr/bin/cosmic-session
+    exec /usr/bin/dbus-run-session -- $SSH_AGENT /usr/bin/cosmic-session
 else
-    exec /usr/bin/cosmic-session
+    exec $SSH_AGENT /usr/bin/cosmic-session
 fi