diff --git a/ChangeLog b/ChangeLog
index 2867e5824d..efa0b7eac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-13  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell-callbacks.c: get the active_tool
+	_after_ maybe changing it by calling devices_check_change().
+
 2001-11-13  Michael Natterer  <mitch@gimp.org>
 
 	* app/gui/menus.c: the toolbox menu's last_used_documents menu
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 35f97dfd36..f027fd4fbe 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -309,12 +309,12 @@ gimp_display_shell_canvas_events (GtkWidget        *canvas,
 
   gdisp = shell->gdisp;
 
-  active_tool = tool_manager_get_active (gdisp->gimage->gimp);
-
   /*  Find out what device the event occurred upon  */
   if (! gdisp->gimage->gimp->busy && devices_check_change (event))
     gimp_display_shell_check_device_cursor (shell);
 
+  active_tool = tool_manager_get_active (gdisp->gimage->gimp);
+
   gimp_display_shell_get_coords (shell, event, current_device, &display_coords);
   gimp_display_shell_get_state (shell, event, current_device, &state);
   time = gdk_event_get_time (event);