diff --git a/ChangeLog b/ChangeLog
index 9b5b79d81bfb6c8a7ea3409e177bbbe7c3b288cd..6c00a995430187505da994c43321405a2196647f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-16  Philippe Brochard  <pbrochard@common-lisp.net>
+
+	* ChangeLog are now reported in git history.
+
 2012-10-08 Michael Raitza <spacefrogg-clfswm@meterriblecrew.net>
 
 	* src/tools.lisp (n-rotate-list): Implementation ehancements (1/2 GC,
diff --git a/src/clfswm.lisp b/src/clfswm.lisp
index 25ed555d7ec528a62bc37488a14d44c266b25b67..ae1729933e8fec496610ae23f2efcebfce6f0e33 100644
--- a/src/clfswm.lisp
+++ b/src/clfswm.lisp
@@ -112,7 +112,8 @@
       (setf (window-state window) +withdrawn-state+)
       (xlib:unmap-window window)
       (remove-child-in-all-frames window)
-      (show-all-children))))
+      (unless (null-size-window-in-frame *root-frame*)
+        (show-all-children)))))
 
 
 
@@ -123,7 +124,8 @@
 	      (xlib:window-equal window event-window))
     (when (find-child window *root-frame*)
       (delete-child-in-all-frames window)
-      (show-all-children)
+      (unless (null-size-window-in-frame *root-frame*)
+        (show-all-children))
       (xlib:destroy-window window))))
 
 (define-handler main-mode :enter-notify  (window root-x root-y)