diff --git a/src/client.c b/src/client.c
index abf539f..713b2e5 100644
--- a/src/client.c
+++ b/src/client.c
@@ -965,8 +965,6 @@ client_new(Window w, XWindowAttributes *wa, bool scan)
      /* Attach */
      SLIST_INSERT_HEAD(&W->h.client, c, next);
 
-     ewmh_set_wm_state(w, NormalState);
-
      if(!scan)
      {
           client_get_name(c);
diff --git a/src/event.c b/src/event.c
index 3eadc80..d368c17 100644
--- a/src/event.c
+++ b/src/event.c
@@ -370,7 +370,7 @@ event_mapnotify(XEvent *e)
           return;
 
      if((c = client_gb_win(ev->window)))
-          ewmh_set_wm_state(c->win, NormalState);
+          client_map(c);
      else if((s = systray_find(ev->window)))
      {
           ewmh_set_wm_state(s->win, NormalState);
diff --git a/src/wmfs.c b/src/wmfs.c
index 39682e1..6e4f392 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -346,7 +346,8 @@ wmfs_scan(void)
           client_focus(fc);
 
      SLIST_FOREACH(c, &W->h.client, next)
-          layout_fix_hole(c);
+          if(c->flags & CLIENT_TILED)
+               layout_fix_hole(c);
 
      W->flags &= ~WMFS_SCAN;