diff --git a/kitty/prewarm.py b/kitty/prewarm.py
index cebb87d39..ed8840ea1 100644
--- a/kitty/prewarm.py
+++ b/kitty/prewarm.py
@@ -63,11 +63,11 @@ class Child:
     child_process_pid: int
 
 
-def wait_for_child_death(child_pid: int, timeout: float = 1) -> Optional[int]:
+def wait_for_child_death(child_pid: int, timeout: float = 1, options: int = 0) -> Optional[int]:
     st = time.monotonic()
     while not timeout or time.monotonic() - st < timeout:
         try:
-            pid, status = os.waitpid(child_pid, os.WNOHANG)
+            pid, status = os.waitpid(child_pid, options | os.WNOHANG)
         except ChildProcessError:
             return 0
         else:
diff --git a/kitty_tests/prewarm.py b/kitty_tests/prewarm.py
index df826ab0c..929d9cb01 100644
--- a/kitty_tests/prewarm.py
+++ b/kitty_tests/prewarm.py
@@ -159,7 +159,7 @@ import os, json; from kitty.utils import *; from kitty.fast_data_types import ge
         self.ae(int(p.from_worker.readline()), data['pid'])
 
     def test_signal_handling(self):
-        from kitty.prewarm import restore_python_signal_handlers
+        from kitty.prewarm import restore_python_signal_handlers, wait_for_child_death
         expecting_code = 0
         expecting_signal = signal.SIGCHLD
         expecting_value = 0
@@ -224,10 +224,15 @@ import os, json; from kitty.utils import *; from kitty.fast_data_types import ge
             expecting_code = None
             expecting_value = 0
             p = run()
-            t(signal.SIGTSTP, CLD_STOPPED)
+            p.send_signal(signal.SIGSTOP)
+            s = wait_for_child_death(p.pid, options=os.WUNTRACED, timeout=5)
+            self.assertTrue(os.WIFSTOPPED(s))
+            t(None, CLD_STOPPED)
+            p.send_signal(signal.SIGCONT)
+            s = wait_for_child_death(p.pid, options=os.WCONTINUED, timeout=5)
+            self.assertTrue(os.WIFCONTINUED(s))
             # macOS does not send SIGCHLD when child is continued
             # https://stackoverflow.com/questions/48487935/sigchld-is-sent-on-sigcont-on-linux-but-not-on-macos
-            p.send_signal(signal.SIGCONT)
             p.stdin.close()
             p.wait(1)
             for fd, event in poll.poll(0):