diff --git a/autostart/services/yubikey-touch-detector.service b/autostart/services/yubikey-touch-detector.service
index 429823b..6d5eb28 100644
--- a/autostart/services/yubikey-touch-detector.service
+++ b/autostart/services/yubikey-touch-detector.service
@@ -1,6 +1,8 @@
 [Unit]
 BindsTo=autostart.target
+PartOf=gpg-agent.service
 After=windowmanager.target
+After=gpg-agent.service
 
 [Service]
 ExecStart=/usr/bin/env yubikey-touch-detector -libnotify