diff --git a/ChangeLog b/ChangeLog
index f184042f3..5037b231e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug  8 14:20:00 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* src/frame.c (meta_frame_set_screen_cursor): Flush after setting
+	cursor. (Rest of #149413).
+
 2004-08-07  Elijah Newren  <newren@math.utah.edu>
 
 	* src/display.c (event_callback): activating the current workspace
diff --git a/src/frame.c b/src/frame.c
index 08ad194e6..a699d1845 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -381,6 +381,7 @@ meta_frame_set_screen_cursor (MetaFrame	*frame,
     { 
       xcursor = meta_display_create_x_cursor (frame->window->display, cursor);
       XDefineCursor (frame->window->display->xdisplay, frame->xwindow, xcursor);
+      XFlush (frame->window->display->xdisplay);
       XFreeCursor (frame->window->display->xdisplay, xcursor);
     }
 }