diff --git a/src/split-wm.scm b/src/split-wm.scm
index 36a1fab..7836381 100644
--- a/src/split-wm.scm
+++ b/src/split-wm.scm
@@ -55,8 +55,8 @@
 	     (set-window-border-width! dpy (client:window client) 0)
 	     (fit-windows wm resizer-window first-client second-client)
 	   
+	     (map-window dpy (client:window client))
 	     (map-window dpy (client:client-window client))
-	     ;;(select-client wm client))) ??
 
 	     (let ((opt (if (eq? (get-option-value (wm:options wm)
 						   'orientation)
@@ -76,7 +76,8 @@
 	     (if (eq? client second-client)
 		 (set! second-client #f))
 	     ;; destroy split if only one client left
-	     (if (not (and first-client second-client))
+	     (if (and (not (and first-client second-client))
+		      (or first-client second-client))
 		 (let ((repl (client:window (or first-client second-client))))
 		   (mdisplay "destroying " wm ". with replacement " repl "\n")
 		   (send (wm:out-channel wm)