diff --git a/ChangeLog b/ChangeLog
index aa44e07c8..81a3458b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-02  Elijah Newren  <newren@gmail.com>
+
+	Patch from Björn Lindqvist to fix a logic error.  #322149.
+
+	* src/window.c (update_resize): && should have been ||.
+	
 2006-01-02  Elijah Newren  <newren@gmail.com>
 
 	Patch from Jens Granseuer to fix build with gcc 2.95.  #322622.
@@ -18,7 +24,6 @@
 	* src/window.c (meta_window_new_with_attrs,
 	  meta_window_apply_session_info, meta_window_resize,
 	  meta_window_resize_with_gravity, meta_window_configure_request):
-
 	Remove C99 style variable initiailization
 
 2006-01-02  Elijah Newren  <newren@gmail.com>
diff --git a/src/window.c b/src/window.c
index f0e6f5ac6..c558f30ea 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6894,11 +6894,8 @@ update_resize (MetaWindow *window,
     }
 
   /* Store the latest resize time, if we actually resized. */
-  if (window->rect.width != old.width &&
-      window->rect.height != old.height)
-    {
-      g_get_current_time (&window->display->grab_last_moveresize_time);
-    }
+  if (window->rect.width != old.width || window->rect.height != old.height)
+    g_get_current_time (&window->display->grab_last_moveresize_time);
 }
 
 typedef struct