diff -u --label /home/politza/src/emacs/git/lisp/wid-edit.el --label \#\<buffer\ wid-edit.el\> /home/politza/src/emacs/git/lisp/wid-edit.el /tmp/buffer-content-124390w3
--- /home/politza/src/emacs/git/lisp/wid-edit.el
+++ #<buffer wid-edit.el>
@@ -3704,9 +3704,9 @@
 	(widget-value-set ',(widget-get widget :parent) color)
 	(let* ((buf (get-buffer "*Colors*"))
 	       (win (get-buffer-window buf 0)))
-	  (bury-buffer buf)
-	  (and win (> (length (window-list)) 1)
-	       (delete-window win)))
+	  (if win
+	      (quit-window nil win)
+	    (bury-buffer buf)))
 	(pop-to-buffer ,(current-buffer))))))
 
 (defun widget-color-sample-face-get (widget)

Diff finished.  Mon Jul 13 10:52:04 2015