diff --git a/ChangeLog b/ChangeLog
index d2c19ba92..1421d8859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-27  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (meta_window_new): search for the window's screen 
+	by root window instead of Screen*, maybe it will help with 
+	bug #82664
+
 2002-05-27  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* autogen.sh: Hook up intltoolize here.
diff --git a/src/metacity.desktop b/src/metacity.desktop
index 6daabe89f..f49ed2d83 100644
--- a/src/metacity.desktop
+++ b/src/metacity.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Metacity
+Name[no]=Metacity
 Exec=metacity
 
 [Window Manager]
diff --git a/src/window.c b/src/window.c
index 9de610467..a3f302029 100644
--- a/src/window.c
+++ b/src/window.c
@@ -282,7 +282,9 @@ meta_window_new (MetaDisplay *display, Window xwindow,
   tmp = display->screens;
   while (tmp != NULL)
     {
-      if (((MetaScreen *)tmp->data)->xscreen == attrs.screen)
+      MetaScreen *scr = tmp->data;
+
+      if (scr->xroot == attrs.root)
         {
           window->screen = tmp->data;
           break;