diff --git a/ChangeLog b/ChangeLog
index 2aaa7b33c9..f2e90d278f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-18  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/tools/gimprectangletool.c
+	(gimp_rectangle_tool_button_press): Clear highlight in previously
+	active shell when changing active shell.
+
 2007-08-18  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/tools/gimpcroptool.c (gimp_crop_tool_button_release): Call
diff --git a/app/tools/gimprectangletool.c b/app/tools/gimprectangletool.c
index ff24d27ae4..38a5c8dd08 100644
--- a/app/tools/gimprectangletool.c
+++ b/app/tools/gimprectangletool.c
@@ -606,7 +606,11 @@ gimp_rectangle_tool_button_press (GimpTool        *tool,
   if (display != tool->display)
     {
       if (gimp_draw_tool_is_active (draw_tool))
-        gimp_draw_tool_stop (draw_tool);
+        {
+          gimp_display_shell_set_highlight (GIMP_DISPLAY_SHELL (draw_tool->display->shell),
+                                            NULL);
+          gimp_draw_tool_stop (draw_tool);
+        }
 
       gimp_rectangle_tool_set_function (rectangle, RECT_CREATING);