diff --git a/src/split-wm.scm b/src/split-wm.scm
index c0864c1..36a1fab 100644
--- a/src/split-wm.scm
+++ b/src/split-wm.scm
@@ -91,7 +91,12 @@
 	  ((fit-client-window)
 	   ;; client changed it's size ??
 	   #t)
-	  
+
+	  ((manager-focused)
+	   (let ((time (second msg))
+		 (cc (wm-current-client wm)))
+	     (if cc (wm-select-client wm cc time))))
+
 	  ((update-client-state) #t)
 
 	  ;; Shortcuts
diff --git a/src/switch-wm.scm b/src/switch-wm.scm
index 32d3933..3abcf6a 100644
--- a/src/switch-wm.scm
+++ b/src/switch-wm.scm
@@ -85,6 +85,11 @@
 			    'focused
 			    'active)))
 	     (set-titlebar-state! empty-titlebar state)))
+
+	  ((manager-focused)
+	   (let ((time (second msg))
+		 (cc (wm-current-client wm)))
+	     (if cc (wm-select-client wm cc time))))
 	  
 	  ((update-client-state)
 	   (let* ((client (second msg))