diff --git a/ChangeLog b/ChangeLog
index 41c8279af..d30843f64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-06  Rob Adams  <robadams@ucla.edu>
+
+	* src/place.c (find_next_cascade): cascade on xinerama with
+	pointer instead of on first xinerama.
+
 2003-04-05  Rob Adams  <robadams@ucla.edu>
 
 	Update placement policy for screen with multiple xineramas.
diff --git a/src/place.c b/src/place.c
index 58d8d6026..4e1a7dde3 100644
--- a/src/place.c
+++ b/src/place.c
@@ -92,7 +92,8 @@ find_next_cascade (MetaWindow *window,
   int x_threshold, y_threshold;
   int window_width, window_height;
   int cascade_stage;
-  MetaRectangle work_area;  
+  MetaRectangle work_area;
+  const MetaXineramaScreenInfo* current;
   
   sorted = g_list_copy (windows);
   sorted = g_list_sort (sorted, northwestcmp);
@@ -123,11 +124,8 @@ find_next_cascade (MetaWindow *window,
    * of NW corner of window frame.
    */
 
-  /* FIXME should use xinerama with mouse pointer
-   * (or better, xinerama where window was launched
-   * determined via startup notification)
-   */
-  meta_window_get_work_area_for_xinerama (window, 0, &work_area);
+  current = meta_screen_get_current_xinerama (window->screen);
+  meta_window_get_work_area_for_xinerama (window, current->number, &work_area);
 
   cascade_x = MAX (0, work_area.x);
   cascade_y = MAX (0, work_area.y);