2 files changed, 7 insertions, 11 deletions
diff --git a/client.c b/client.c
index 510ec598..5309d0eb 100644
--- a/client.c
+++ b/client.c
@@ -89,16 +89,12 @@ focus(Client *c) {
 		XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
 	}
 	if(c) {
-		if(issel) {
-			detachstack(c);
-			c->snext = stack;
-			stack = c;
-			grabbuttons(c, True);
-			XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
-			XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		}
-		else
-			XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
+		grabbuttons(c, True);
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else if(issel)
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
diff --git a/event.c b/event.c
index 2e021d58..c913320b 100644
--- a/event.c
+++ b/event.c
@@ -270,7 +270,7 @@ leavenotify(XEvent *e) {
 
 	if((ev->window == root) && !ev->same_screen) {
 		issel = False;
-		focus(sel);
+		focus(NULL);
 	}
 }