diff -rup dwm-6.0-orig/dwm.c dwm-6.0/dwm.c
--- dwm-6.0-orig/dwm.c	2011-12-19 22:22:25.000000000 +0100
+++ dwm-6.0/dwm.c	2012-02-23 21:00:26.000000000 +0100
@@ -456,6 +456,7 @@ buttonpress(XEvent *e) {
 	}
 	else if((c = wintoclient(ev->window))) {
 		focus(c);
+		restack(selmon);
 		click = ClkClientWin;
 	}
 	for(i = 0; i < LENGTH(buttons); i++)
@@ -829,6 +830,7 @@ enternotify(XEvent *e) {
 	else if(!c || c == selmon->sel)
 		return;
 	focus(c);
+	restack(selmon);
 }
 
 void