diff --git a/client.c b/client.c
index 0e693c5f..9096f9bc 100644
--- a/client.c
+++ b/client.c
@@ -677,7 +677,7 @@ client_setfullscreen(client_t *c, bool s)
         /* become fullscreen! */
         if((c->isfullscreen = s))
         {
-            geometry = screen_area_get(c->screen, NULL, &globalconf.screens[c->screen].padding, false);
+            geometry = screen_area_get(c->screen, NULL, NULL, false);
             c->m_geometry = c->geometry;
             c->oldborder = c->border;
             client_setborder(c, 0);
diff --git a/layouts/max.c b/layouts/max.c
index a41e2fae..2f1c2301 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -32,7 +32,7 @@ layout_fmax(int screen, bool fs)
     client_t *c;
     area_t area = screen_area_get(screen,
                                   fs ? NULL : &globalconf.screens[screen].wiboxes,
-                                  &globalconf.screens[screen].padding,
+                                  fs ? NULL : &globalconf.screens[screen].padding,
                                   true);
 
     for(c = globalconf.clients; c; c = c->next)