diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 294698aea..0848dde77 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -2361,6 +2361,13 @@ e_client_desk_set(E_Client *ec, E_Desk *desk)
         ev->desk = old_desk;
         e_object_ref(E_OBJECT(old_desk));
         ecore_event_add(E_EVENT_CLIENT_DESK_SET, ev, (Ecore_End_Cb)_e_client_event_desk_set_free, NULL);
+
+        if (old_desk->zone == ec->zone)
+          {
+             e_client_res_change_geometry_save(ec);
+             e_client_res_change_geometry_restore(ec);
+             ec->pre_res_change.valid = 0;
+          }
      }
 
    if (e_config->transient.desktop)