diff --git a/src/ewins.c b/src/ewins.c
index ce2f2682..c188e5c4 100644
--- a/src/ewins.c
+++ b/src/ewins.c
@@ -1007,6 +1007,8 @@ EwinUnmap2(EWin * ewin)
       Mode.mouse_over_ewin = NULL;
    if (ewin == Mode.context_ewin)
       Mode.context_ewin = NULL;
+
+   ModulesSignal(ESIGNAL_EWIN_UNMAP, ewin);
 }
 
 static void
@@ -1148,8 +1150,6 @@ EwinEventUnmap(EWin * ewin)
    EoUnmap(ewin);
    EwinUnmap2(ewin);
 
-   ModulesSignal(ESIGNAL_EWIN_UNMAP, ewin);
-
    if (ewin->state.state == EWIN_STATE_ICONIC)
       return;