1 files changed, 2 insertions, 1 deletions
diff --git a/client.c b/client.c
index f2cd802c..7ccad39f 100644
--- a/client.c
+++ b/client.c
@@ -95,7 +95,7 @@ focus(Client *c) {
 	drawstatus();
 	if(!activescreen)
 		return;
-	if(sel) {
+	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
@@ -157,6 +157,7 @@ manage(Window w, XWindowAttributes *wa) {
 		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 	XGetTransientForHint(dpy, c->win, &trans);
 	grabbuttons(c, False);
+	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
 	updatetitle(c);
 	settags(c, getclient(trans));
 	if(!c->isfloat)