diff --git a/awesome.c b/awesome.c
index b31b38ee..b63c1a2f 100644
--- a/awesome.c
+++ b/awesome.c
@@ -175,8 +175,7 @@ exit_on_signal(int sig __attribute__ ((unused)))
 static int
 xerror(Display * edpy, XErrorEvent * ee)
 {
-    if(ee->error_code == BadWindow
-       || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch))
+    if(ee->error_code == BadWindow)
         return 0;
     warn("fatal error: request code=%d, error code=%d\n", ee->request_code, ee->error_code);
     return xerrorxlib(edpy, ee);        /* may call exit */
diff --git a/client.c b/client.c
index f5016d8a..3663a68a 100644
--- a/client.c
+++ b/client.c
@@ -317,10 +317,6 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
     else
         client_list_append(&globalconf.clients, c);
 
-    /* focus ? */
-    if(globalconf.screens[c->screen].new_get_focus)
-        focus(c, c->screen);
-
     /* some windows require this */
     XMoveResizeWindow(globalconf.display, c->win, c->geometry.x, c->geometry.y,
                       c->geometry.width, c->geometry.height);