diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 17cacf5ec..1da6e9648 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -1271,9 +1271,6 @@ _e_client_cb_evas_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN
    if (action_client == ec) _e_client_action_finish();
    e_pointer_type_pop(ec->comp->pointer, ec, NULL);
 
-   if ((!ec->iconic) && (!ec->override))
-      e_hints_window_hidden_set(ec);
-
    if (!ec->hidden)
      {
         ec->visible = 0;
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 098534f14..bb8c89906 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1156,6 +1156,8 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
 
    if (!cw->defer_hide)
      {
+        if ((!cw->ec->iconic) && (!cw->ec->override) && (!cw->ec->delete_requested))
+          e_hints_window_hidden_set(cw->ec);
         cw->defer_hide = 1;
         if ((!cw->animating) || (cw->ec->iconic))
           {