diff --git a/ChangeLog b/ChangeLog
index 8b0967179f..8589b1568c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-08  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimpiscissorstool.c (gimp_iscissors_tool_button_press): 
+	don't activate the iscissors tool if it's already active
+	(bug #132351).
+
 2004-02-08  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimptexttool.c (gimp_text_tool_set_layer): implemented
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
index 8bf214d4c4..bf17afcf3a 100644
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@@ -435,13 +435,20 @@ gimp_iscissors_tool_button_press (GimpTool        *tool,
 
   /*  If the tool was being used in another image...reset it  */
 
-  if (gimp_tool_control_is_active (tool->control) && gdisp != tool->gdisp)
+  if (gimp_tool_control_is_active (tool->control))
     {
-      gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
-      gimp_iscissors_tool_reset (iscissors);
+      if (gdisp != tool->gdisp)
+        {
+          gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+          gimp_iscissors_tool_reset (iscissors);
+          gimp_tool_control_activate (tool->control);
+        }
+    }
+  else
+    {
+      gimp_tool_control_activate (tool->control);
     }
 
-  gimp_tool_control_activate (tool->control);
   tool->gdisp = gdisp;
 
   switch (iscissors->state)