diff --git a/src/move-wm.scm b/src/move-wm.scm
index ab38190..dd2628e 100644
--- a/src/move-wm.scm
+++ b/src/move-wm.scm
@@ -62,6 +62,8 @@
 	   ;; client changed it's size ??
 	   (fit-client-window wm (second msg)))
 	  
+	  ((manager-focused) #t)
+
 	  ((update-client-state)
 	   (let* ((client (second msg))
 		  (dpy (wm:dpy wm))
@@ -85,9 +87,12 @@
 	   (resizer (create-resizer wm client))
 	   (options (wm:options wm)))
       (set-client:data! client (list titlebar resizer))
-      (move-resize-window dpy (client:client-window client)
-			  (rectangle:x r) (rectangle:y r)
-			  (rectangle:width r) (rectangle:height r))
+      (let ((bw (get-option-value options 'border-width))
+	    (th (get-option-value options 'titlebar-height)))
+	(move-resize-window dpy (client:client-window client)
+			    (rectangle:x r) (rectangle:y r)
+			    (+ (rectangle:width r) (* 2 bw))
+			    (+ (rectangle:height r) (* 2 bw) th)))
       (fit-client-windows wm client)
 
       (install-dragging-control channel dpy