diff --git a/src/layout.c b/src/layout.c
index ccb9b36..0922619 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -557,7 +557,7 @@ uicb_layout_hmirror(Uicb cmd)
      layout_save_set(W->screen->seltag);
 }
 
-#define LAYOUT_INTEGRATE_DIR(D)\
+#define LAYOUT_INTEGRATE_DIR(D)                                         \
      void uicb_layout_integrate_##D(Uicb cmd)                           \
      {                                                                  \
           (void)cmd;                                                    \
diff --git a/src/wmfs.c b/src/wmfs.c
index b359df3..a479517 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #include "client.h"
 #include "fifo.h"
+#include "layout.h"
 
 int
 wmfs_error_handler(Display *d, XErrorEvent *event)
@@ -344,6 +345,9 @@ wmfs_scan(void)
      if((fc = client_gb_win(focus)) && fc != W->client)
           client_focus(fc);
 
+     SLIST_FOREACH(c, &W->h.client, next)
+          layout_fix_hole(c);
+
      W->flags &= ~WMFS_SCAN;
 
      if(tret)