diff --git a/ChangeLog b/ChangeLog
index 579a297d25..8a19421cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-14  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimpcolorpickertool.c
+	* app/tools/gimpcroptool.c
+	* app/tools/gimpimagemaptool.c
+	* app/tools/gimpmeasuretool.c
+	* app/tools/gimptransformtool.c: don't set tool dialogs transient
+	to the image window. Fixes bug #128833.
+
 2004-03-14  Sven Neumann  <sven@gimp.org>
 
 	* app/gui/about-dialog.c: don't abuse the SPLASHSCREEN window type
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index 709a275a8e..8707457188 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -311,7 +311,7 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
   g_return_if_fail (tool->drawable != NULL);
 
   picker_tool->dialog = gimp_tool_dialog_new (tool->tool_info,
-                                              GIMP_TOOL (picker_tool)->gdisp->shell,
+                                              NULL /* tool->gdisp->shell */,
                                               _("Color Picker Information"),
 
                                               GTK_STOCK_CLOSE,
diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c
index bf3541b120..ef1a614394 100644
--- a/app/tools/gimpcroptool.c
+++ b/app/tools/gimpcroptool.c
@@ -962,7 +962,7 @@ crop_info_create (GimpCropTool *crop)
                                      GIMP_OBJECT (tool->tool_info)->name,
                                      stock_id,
                                      _("Crop & Resize Information"),
-                                     GTK_WIDGET (shell),
+                                     NULL /* gdisp->shell */,
                                      gimp_standard_help_func,
                                      tool->tool_info->help_id);
 
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index e3f5963a7e..6cfe450df0 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -219,7 +219,8 @@ gimp_image_map_tool_initialize (GimpTool    *tool,
       stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool_info));
 
       image_map_tool->shell = shell =
-        gimp_tool_dialog_new (tool_info, gdisp->shell,
+        gimp_tool_dialog_new (tool_info,
+                              NULL /* gdisp->shell */,
                               klass->shell_desc,
 
                               GIMP_STOCK_RESET, RESPONSE_RESET,
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index ad0bdff335..2043c7ec1c 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -827,13 +827,14 @@ gimp_measure_tool_dialog_update (GimpMeasureTool *mtool,
 static GtkWidget *
 gimp_measure_tool_dialog_new (GimpMeasureTool *mtool)
 {
+  GimpTool  *tool = GIMP_TOOL (mtool);
   GtkWidget *dialog;
   GtkWidget *hbox;
   GtkWidget *table;
   GtkWidget *label;
 
-  dialog = gimp_tool_dialog_new (GIMP_TOOL (mtool)->tool_info,
-                                 GIMP_TOOL (mtool)->gdisp->shell,
+  dialog = gimp_tool_dialog_new (tool->tool_info,
+                                 NULL /* tool->gdisp->shell */,
                                  _("Measure Distances and Angles"),
 
                                  GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index bdc6cdbd84..7954ec0f16 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -1251,6 +1251,7 @@ gimp_transform_tool_grid_recalc (GimpTransformTool *tr_tool)
 static void
 gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
 {
+  GimpTool     *tool = GIMP_TOOL (tr_tool);
   GimpToolInfo *tool_info;
   const gchar  *stock_id;
   gchar        *identifier;
@@ -1258,7 +1259,7 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
   if (! GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->dialog)
     return;
 
-  tool_info = GIMP_TOOL (tr_tool)->tool_info;
+  tool_info = tool->tool_info;
 
   stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool_info));
 
@@ -1267,7 +1268,7 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
                                           GIMP_OBJECT (tool_info)->name,
                                           stock_id,
                                           tr_tool->shell_desc,
-                                          GIMP_TOOL (tr_tool)->gdisp->shell,
+                                          NULL /* tool->gdisp->shell */,
                                           gimp_standard_help_func,
                                           tool_info->help_id);