diff --git a/client.c b/client.c
index 3d8bce39..79e12d69 100644
--- a/client.c
+++ b/client.c
@@ -583,7 +583,8 @@ client_resize(client_t *c, area_t geometry, bool hints)
         /* save the floating geometry if the window is floating but not
          * maximized */
         if(c->ismoving || client_isfloating(c)
-           || layout_get_current(new_screen) == layout_floating)
+           || layout_get_current(new_screen) == layout_floating
+           || layout_get_current(c->screen) == layout_floating)
             if(!c->isfullscreen)
                 c->f_geometry = geometry;