diff --git a/frontend/saned.c b/frontend/saned.c
index f320a54b8..6c1be68f1 100644
--- a/frontend/saned.c
+++ b/frontend/saned.c
@@ -3264,11 +3264,11 @@ run_standalone (char *user)
       close (fd);
 
       setsid ();
-
-      signal(SIGINT, sig_int_term_handler);
-      signal(SIGTERM, sig_int_term_handler);
     }
 
+  signal(SIGINT, sig_int_term_handler);
+  signal(SIGTERM, sig_int_term_handler);
+
   if (user)
     runas_user(user);