diff --git a/ChangeLog b/ChangeLog
index 12b417256e..d29b2506c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-12  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplay.c (gimp_display_reconnect): HALT the
+	active tool before reconnecting. Fixes bug #124388.
+
 2003-10-12  Sven Neumann  <sven@gimp.org>
 
 	* app/config/gimpconfig-serialize.[ch]: removed function
diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c
index 0fc31e7a38..c7ace47268 100644
--- a/app/core/gimpprojection.c
+++ b/app/core/gimpprojection.c
@@ -320,6 +320,9 @@ gimp_display_reconnect (GimpDisplay *gdisp,
       gdisp->idle_render.idle_id = 0;
     }
 
+  /*  stop any active tool  */
+  tool_manager_control_active (gdisp->gimage->gimp, HALT, gdisp);
+
   gimp_display_shell_disconnect (GIMP_DISPLAY_SHELL (gdisp->shell));
 
   gimp_display_disconnect (gdisp);
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index 0fc31e7a38..c7ace47268 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -320,6 +320,9 @@ gimp_display_reconnect (GimpDisplay *gdisp,
       gdisp->idle_render.idle_id = 0;
     }
 
+  /*  stop any active tool  */
+  tool_manager_control_active (gdisp->gimage->gimp, HALT, gdisp);
+
   gimp_display_shell_disconnect (GIMP_DISPLAY_SHELL (gdisp->shell));
 
   gimp_display_disconnect (gdisp);