diff --git a/ChangeLog b/ChangeLog
index d2284f6fc..d51537684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-12  Elijah Newren  <newren gmail com>
+
+	* src/place.c (meta_window_place): do not auto-maximize windows
+	larger than the workarea in only a single direction.  Fixes
+	#419810.
+
 2007-04-11  Elijah Newren  <newren gmail com>
 
 	Make sure apps have correct info about their coordinates, even on
diff --git a/src/place.c b/src/place.c
index bf88779f1..6c087b51f 100644
--- a/src/place.c
+++ b/src/place.c
@@ -924,11 +924,14 @@ meta_window_place (MetaWindow        *window,
                                               &workarea);      
       meta_window_get_outer_rect (window, &outer);
       
-      if (outer.width >= workarea.width)
-        window->maximize_horizontally_after_placement = TRUE;
-
-      if (outer.height >= workarea.height)
-        window->maximize_vertically_after_placement = TRUE;
+      /* If the window is bigger than the screen, then automaximize.  Do NOT
+       * auto-maximize the directions independently.  See #419810.
+       */
+      if (outer.width >= workarea.width && outer.height >= workarea.height)
+        {
+          window->maximize_horizontally_after_placement = TRUE;
+          window->maximize_vertically_after_placement = TRUE;
+        }
     }
 
  done_check_denied_focus: