diff --git a/ChangeLog b/ChangeLog
index a2ed6ebe2..f5e78f501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-24  Elijah Newren  <newren@gmail.com>
+
+	* src/display.c: (meta_display_begin_grab_op): don't forget to
+	initialize display->grab_old_window_stacking.  Thanks to Sebastien
+	Bacher and the bleeding edge Ubuntu users for catching the
+	occasional crash this could cause so quickly, and for verifying
+	that the patch worked (I couldn't duplicate).  Fixes #165093.
+
 2005-01-23  Elijah Newren  <newren@gmail.com>
 
 	* configure.in: post-release version bump to 2.9.8
diff --git a/src/display.c b/src/display.c
index 26a38f2a8..543073bdb 100644
--- a/src/display.c
+++ b/src/display.c
@@ -3200,6 +3200,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
   display->grab_last_moveresize_time.tv_sec = 0;
   display->grab_last_moveresize_time.tv_usec = 0;
   display->grab_motion_notify_time = 0;
+  display->grab_old_window_stacking = NULL;
 #ifdef HAVE_XSYNC
   display->grab_sync_request_alarm = None;
 #endif