diff --git a/ChangeLog b/ChangeLog
index dcfb8e82a6..aed3d91a9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-14  Michael Natterer  <mitch@gimp.org>
+
+	* app/gui/plug-in-commands.c (plug_in_repeat_cmd_callback):
+	use gdisp->gimage->gimp instead of the_gimp.
+
+	* app/tools/gimpimagemaptool.c: pass update_popup == FALSE to
+	gimp_display_shell_set_menu_sensitivity().
+
 2002-12-14  Sven Neumann  <sven@gimp.org>
 
 	* app/gui/plug-in-commands.c (plug_in_repeat_cmd_callback): data
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
index 7c736c18a4..b7d899502e 100644
--- a/app/actions/plug-in-commands.c
+++ b/app/actions/plug-in-commands.c
@@ -157,7 +157,7 @@ plug_in_repeat_cmd_callback (GtkWidget *widget,
 
   interactive = action ? TRUE : FALSE;
 
-  plug_in_repeat (the_gimp,
+  plug_in_repeat (gdisp->gimage->gimp,
                   gimp_display_get_ID (gdisp),
                   gimp_image_get_ID (gdisp->gimage),
                   gimp_item_get_ID (GIMP_ITEM (drawable)),
diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c
index 7c736c18a4..b7d899502e 100644
--- a/app/gui/plug-in-commands.c
+++ b/app/gui/plug-in-commands.c
@@ -157,7 +157,7 @@ plug_in_repeat_cmd_callback (GtkWidget *widget,
 
   interactive = action ? TRUE : FALSE;
 
-  plug_in_repeat (the_gimp,
+  plug_in_repeat (gdisp->gimage->gimp,
                   gimp_display_get_ID (gdisp),
                   gimp_image_get_ID (gdisp->gimage),
                   gimp_item_get_ID (GIMP_ITEM (drawable)),
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index dc2b100db4..27a0085f7f 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -257,7 +257,7 @@ gimp_image_map_tool_initialize (GimpTool    *tool,
                     image_map_tool);
 
   gimp_display_shell_set_menu_sensitivity (GIMP_DISPLAY_SHELL (gdisp->shell),
-                                           gdisp->gimage->gimp, TRUE);
+                                           gdisp->gimage->gimp, FALSE);
 }
 
 static void
@@ -378,7 +378,7 @@ gimp_image_map_tool_ok_clicked (GtkWidget        *widget,
   gimp_tool_control_set_preserve (tool->control, FALSE);
 
   gimp_display_shell_set_menu_sensitivity (GIMP_DISPLAY_SHELL (tool->gdisp->shell),
-                                           tool->gdisp->gimage->gimp, TRUE);
+                                           tool->gdisp->gimage->gimp, FALSE);
 
   tool->gdisp    = NULL;
   tool->drawable = NULL;