Index: src/window.c
===================================================================
--- src/window.c	(revision 3188)
+++ src/window.c	(working copy)
@@ -6287,7 +6287,8 @@
    * only recalc_window_features when something
    * has actually changed.
    */
-  if (old_has_close_func != window->has_close_func       ||
+  if (window->constructing                               ||
+      old_has_close_func != window->has_close_func       ||
       old_has_minimize_func != window->has_minimize_func ||
       old_has_move_func != window->has_move_func         ||
       old_has_resize_func != window->has_resize_func     ||
