diff --git a/autostart/services/autostart.target b/autostart/services/autostart.target
index b2c43db..829513f 100644
--- a/autostart/services/autostart.target
+++ b/autostart/services/autostart.target
@@ -8,6 +8,7 @@ Wants=dpms.service
 Wants=dunst.service
 Wants=firefox.service
 Wants=gpg-agent.service
+Wants=gnome-keyring.service
 Wants=keepassx.service
 Wants=keyboard.service
 Wants=laptop-lid.service
diff --git a/autostart/services/gnome-keyring.service b/autostart/services/gnome-keyring.service
new file mode 100644
index 0000000..e8d5f52
--- /dev/null
+++ b/autostart/services/gnome-keyring.service
@@ -0,0 +1,6 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env gnome-keyring-daemon --start --foreground --components secrets
diff --git a/autostart/services/nextcloud.service b/autostart/services/nextcloud.service
index 056c5a2..af0ffd7 100644
--- a/autostart/services/nextcloud.service
+++ b/autostart/services/nextcloud.service
@@ -1,6 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
+After=gnome-keyring.service
 
 ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true