diff --git a/ChangeLog b/ChangeLog
index 9bd5c34b1..b7d629ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* src/place.c (meta_window_place): don't return null on non-multihead
+
 2002-06-06  Havoc Pennington  <hp@pobox.com>
 
 	* src/screen.c (meta_screen_get_current_xinerama): implement
diff --git a/src/screen.c b/src/screen.c
index a983d9fb0..986eada59 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -849,7 +849,7 @@ const MetaXineramaScreenInfo*
 meta_screen_get_current_xinerama (MetaScreen *screen)
 {
   if (screen->n_xinerama_infos == 1)
-    return 0;
+    return &screen->xinerama_infos[0];
 
   /* Sadly, we have to do it this way. Yuck.
    */