diff --git a/ChangeLog b/ChangeLog
index fac639e49..f795119b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-23  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (meta_window_new_with_attrs): Fix crash that
+	occurs when stupid apps claim that a window is its own parent.
+	#168207
+
 2005-02-21  Elijah Newren  <newren@gmail.com>
 
 	* configure.in: post-release version bump to 2.9.34
diff --git a/src/window.c b/src/window.c
index 23845ada0..445224a2b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -648,7 +648,7 @@ meta_window_new_with_attrs (MetaDisplay       *display,
       parent = meta_display_lookup_x_window (window->display,
                                              window->xtransient_for);
 
-      if (parent)
+      if (parent && parent->workspace)
         {
           meta_topic (META_DEBUG_PLACEMENT,
                       "Putting window %s on same workspace as parent %s\n",