diff --git a/ChangeLog b/ChangeLog
index cbc537fb4..143d32e82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-07  Elijah Newren  <newren gmail com>
+
+	* src/constraints.c (update_onscreen_requirements): make sure
+	windows returning from fullscreen mode are constrained to be
+	"onscreen"; fixes #353699.
+
 2006-08-30  Colin Watson  <cjwatson@ubuntu.com>
 
 	* src/window-props.c (reload_transient_for): Clear
diff --git a/src/constraints.c b/src/constraints.c
index 5a85ae926..ea78f39c1 100644
--- a/src/constraints.c
+++ b/src/constraints.c
@@ -560,6 +560,16 @@ update_onscreen_requirements (MetaWindow     *window,
       window->type == META_WINDOW_DOCK)
     return;
 
+  /* We don't want to update the requirements for fullscreen windows;
+   * fullscreen windows are specially handled anyway, and it updating
+   * the requirements when windows enter fullscreen mode mess up the
+   * handling of the window when it leaves that mode (especially when
+   * the application sends a bunch of configurerequest events).  See
+   * #353699.
+   */
+  if (window->fullscreen)
+    return;
+
   /* USABILITY NOTE: Naturally, I only want the require_fully_onscreen,
    * require_on_single_xinerama, and require_titlebar_visible flags to
    * *become false* due to user interactions (which is allowed since