diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 1705202b..0220a949 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -149,7 +149,9 @@ void screen::processEvent(const XEvent &e) {
                                  DestroyNotify, &ev) ||
           XCheckTypedWindowEvent(_epist->getXDisplay(), e.xany.window,
                                  UnmapNotify, &ev)) {
-        processEvent(ev);
+
+        XWindow *win = _epist->findWindow(e.xany.window);
+        if (win) win->processEvent(ev);
       }
 
       updateClientList();