diff --git a/ChangeLog b/ChangeLog
index bcfba1bf31..da948c2fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-04  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell-callbacks.c
+	(gimp_display_shell_canvas_tool_events): undraw the cursor on
+	GDK_PROXIMITY_OUT. Always set shell->proximity to FALSE *before*
+	calling gimp_display_shell_update_cursor().
+
 2003-06-04  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/film.c: use a font selection widget (bug #113884).
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 1e2bd6a263..ac7bab0c6e 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -446,9 +446,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
         if (cevent->mode != GDK_CROSSING_NORMAL)
           return TRUE;
 
-        gimp_display_shell_update_cursor (shell, -1, -1);
-
         shell->proximity = FALSE;
+        gimp_display_shell_update_cursor (shell, -1, -1);
       }
       break;
 
@@ -457,6 +456,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
 
     case GDK_PROXIMITY_OUT:
       shell->proximity = FALSE;
+      gimp_display_shell_update_cursor (shell, -1, -1);
       break;
 
     case GDK_FOCUS_CHANGE: