diff --git a/ChangeLog b/ChangeLog
index 260aa32c1..fce5c5a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-10  Elijah Newren  <newren gmail com>
+
+	* src/window.c (recalc_window_features): make sure to set
+	_NET_WM_ALLOWED_ACTIONS so that libwnck menus don't have sensitive
+	but ineffective menu items.  The "On Top" item is now buggy, but
+	due to the fact that _NET_WM_ACTION_ABOVE is not yet defined in
+	the EWMH.  Fixes #115247.
+
 2007-04-09  Elijah Newren  <newren gmail com>
 
 	Add support for _NET_MOVERESIZE_WINDOW.  #344521.
diff --git a/src/window.c b/src/window.c
index 4bf5b548a..9aaa682d8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6287,7 +6287,8 @@ recalc_window_features (MetaWindow *window)
    * 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     ||