diff --git a/ChangeLog b/ChangeLog
index c5f74a9ca7..82a6ad792e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+2005-08-07  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimpforegroundselecttool.c: do not restart draw tool
+	unless shell->proximity.
+
 2005-08-07  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimpforegroundselecttool.c
 	(gimp_foreground_select_tool_draw): show the extents of the working
 	area if the user moves the mouse out of it. Is this useful?
+	
 
 	* app/tools/gimpforegroundselectoptions.c: removed colons from labels.
 
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index 748f35522b..8cc1b456dc 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -343,7 +343,7 @@ gimp_foreground_select_tool_oper_update (GimpTool        *tool,
   if (status)
     gimp_tool_replace_status (tool, gdisp, status);
 
-  if (fg_select->mask)
+  if (fg_select->mask && GIMP_DISPLAY_SHELL (gdisp->shell)->proximity)
     gimp_draw_tool_start (draw_tool, gdisp);
 }