diff --git a/src/wmfs.c b/src/wmfs.c
index 6dabad5..c5854b3 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -158,8 +158,13 @@ mainloop(void)
 {
      XEvent ev;
 
-     while(!exiting && !XNextEvent(dpy, &ev))
+     while(!exiting && !XNextEvent(dpy, &ev)) {
+          if (sig_chld) {
+               while(waitpid(-1, NULL, WNOHANG) > 0);
+               sig_chld = False;
+          }
           HANDLE_EVENT(&ev);
+     }
 
      return;
 }