diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index bdf464251..1ae391828 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3797,13 +3797,15 @@ e_client_maximize(E_Client *ec, E_Maximize max)
      {
         /* Horizontal hasn't been set */
         ec->saved.x = ec->client.x - ec->zone->x;
-        ec->saved.w = ec->client.w;
+        if (ec->visible)
+          ec->saved.w = ec->client.w;
      }
    if (!(ec->maximized & E_MAXIMIZE_VERTICAL))
      {
         /* Vertical hasn't been set */
         ec->saved.y = ec->client.y - ec->zone->y;
-        ec->saved.h = ec->client.h;
+        if (ec->visible)
+          ec->saved.h = ec->client.h;
      }
 
    ec->saved.zone = ec->zone->num;
@@ -4026,8 +4028,11 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
      {
         ec->saved.x = ec->client.x - ec->zone->x;
         ec->saved.y = ec->client.y - ec->zone->y;
-        ec->saved.w = ec->client.w;
-        ec->saved.h = ec->client.h;
+        if (ec->visible)
+          {
+             ec->saved.w = ec->client.w;
+             ec->saved.h = ec->client.h;
+          }
      }
    ec->saved.maximized = ec->maximized;
    ec->saved.zone = ec->zone->num;