diff --git a/ChangeLog b/ChangeLog
index 2a1046b3d6..be5ae11f5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-09  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/animationplay.c: added accelerators for "close"
+	and "quit" actions.
+
+	* plug-ins/helpbrowser/dialog.c: added "close" to the popup menu.
+
 2006-03-09  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/imagemap/imap_main.c (button_press): do not attempt to
diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c
index 8377f9e387..5bc5a6961a 100644
--- a/plug-ins/common/animationplay.c
+++ b/plug-ins/common/animationplay.c
@@ -237,9 +237,7 @@ menu_popup (GtkWidget      *widget,
       GtkWidget *menu = gtk_ui_manager_get_widget (ui_manager,
                                                    "/anim-play-popup");
 
-      gtk_widget_grab_focus (widget);
-
-      gtk_menu_set_screen (GTK_MENU (menu), gtk_widget_get_screen (widget));
+      gtk_menu_attach_to_widget (GTK_MENU (menu), widget, NULL);
       gtk_menu_popup (GTK_MENU (menu),
                       NULL, NULL, NULL, NULL,
                       event->button, event->time);
@@ -428,10 +426,6 @@ ui_manager_new (GtkWidget *window)
 {
   static GtkActionEntry actions[] =
   {
-    { "close", GTK_STOCK_CLOSE,
-      NULL, NULL, NULL,
-      G_CALLBACK (close_callback) },
-
     { "step", GTK_STOCK_MEDIA_NEXT,
       N_("_Step"), NULL, N_("Step to next frame"),
       G_CALLBACK (step_callback) },
@@ -442,7 +436,17 @@ ui_manager_new (GtkWidget *window)
 
     { "help", GTK_STOCK_HELP,
       NULL, NULL, NULL,
-      G_CALLBACK (help_callback) }
+      G_CALLBACK (help_callback) },
+
+    { "close", GTK_STOCK_CLOSE,
+      NULL, "<control>W", NULL,
+      G_CALLBACK (close_callback)
+    },
+    {
+      "quit", GTK_STOCK_QUIT,
+      NULL, "<control>Q", NULL,
+      G_CALLBACK (close_callback)
+    }
   };
 
   static GtkToggleActionEntry toggle_actions[] =
@@ -489,7 +493,9 @@ ui_manager_new (GtkWidget *window)
                                      "    <toolitem action=\"detach\" />"
                                      "    <separator name=\"space\" />"
                                      "    <toolitem action=\"help\" />"
-                                      "  </toolbar>"
+                                     "  </toolbar>"
+                                     "  <accelerator action=\"close\" />"
+                                     "  <accelerator action=\"quit\" />"
                                      "</ui>",
                                      -1, &error);
 
diff --git a/plug-ins/helpbrowser/dialog.c b/plug-ins/helpbrowser/dialog.c
index 7f7eb09c07..c1bce1f5b3 100644
--- a/plug-ins/helpbrowser/dialog.c
+++ b/plug-ins/helpbrowser/dialog.c
@@ -552,6 +552,8 @@ ui_manager_new (GtkWidget *window)
                                      "    <separator />"
                                      "    <menuitem action=\"zoom-in\" />"
                                      "    <menuitem action=\"zoom-out\" />"
+                                     "    <separator />"
+                                     "    <menuitem action=\"close\" />"
                                      "  </popup>"
                                      "</ui>",
                                      -1, &error);