diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 05066dbe3..6673e3e31 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4027,7 +4027,6 @@ e_client_iconify(E_Client *ec)
         _e_client_revert_focus(ec);
         evas_object_hide(ec->frame);
      }
-   e_hints_window_iconic_set(ec);
    e_client_urgent_set(ec, ec->icccm.urgent);
 
    _e_client_event_simple(ec, E_EVENT_CLIENT_ICONIFY);
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 3a504dcbf..63074c3ec 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -971,6 +971,8 @@ _e_comp_x_client_hide(E_Client *ec)
 
    if (ec->unredirected_single || ec->iconic)
      ecore_x_window_hide(_e_comp_x_client_window_get(ec));
+   if (ec->iconic)
+     e_hints_window_iconic_set(ec);
 }
 
 static void