diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index fb2a89635..f9856ea01 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -909,15 +909,15 @@ keyboxd_runtime_change (int killflag)
   int cmdidx;
 
   pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
-  argv[i++] = "--no-autostart";
-  argv[i++] = "--keyboxd";
-  cmdidx = i;
-  argv[i++] = killflag? "KILLKEYBOXD" : "RELOADKEYBOXD";
   if (!gnupg_default_homedir_p ())
     {
       argv[i++] = "--homedir";
       argv[i++] = gnupg_homedir ();
     }
+  argv[i++] = "--no-autostart";
+  argv[i++] = "--keyboxd";
+  cmdidx = i;
+  argv[i++] = killflag? "KILLKEYBOXD" : "RELOADKEYBOXD";
   argv[i] = NULL;
   log_assert (i < DIM(argv));