diff --git a/src/nnn.c b/src/nnn.c
index 06111a8e..eabe30f0 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -464,10 +464,6 @@ typedef struct {
 
 static thread_data *core_data;
 
-/* Retain old signal handlers */
-static struct sigaction oldsighup;
-static struct sigaction oldsigtstp;
-
 /* For use in functions which are isolated and don't return the buffer */
 static char g_buf[CMD_LEN_MAX] __attribute__ ((aligned));
 
@@ -1997,8 +1993,8 @@ static pid_t xfork(uchar_t flag)
 
 	if (p > 0) {
 		/* the parent ignores the interrupt, quit and hangup signals */
-		sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_IGN}, &oldsighup);
-		sigaction(SIGTSTP, &(struct sigaction){.sa_handler = SIG_DFL}, &oldsigtstp);
+		sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_IGN}, NULL);
+		sigaction(SIGTSTP, &(struct sigaction){.sa_handler = SIG_DFL}, NULL);
 	} else if (p == 0) {
 		/* We create a grandchild to detach */
 		if (flag & F_NOWAIT) {
@@ -2045,8 +2041,8 @@ static int join(pid_t p, uchar_t flag)
 	}
 
 	/* restore parent's signal handling */
-	sigaction(SIGHUP, &oldsighup, NULL);
-	sigaction(SIGTSTP, &oldsigtstp, NULL);
+	sigaction(SIGHUP, &(struct sigaction){.sa_handler = clean_exit_sighandler}, NULL);
+	sigaction(SIGTSTP, &(struct sigaction){.sa_handler = clean_exit_sighandler}, NULL);
 
 	return status;
 }