diff --git a/ChangeLog b/ChangeLog
index 30eaa6068d..e001f9c96f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-25  Michael Natterer  <mitch@gimp.org>
+
+	* app/actions/file-actions.c (file_actions_setup)
+	(file_actions_last_opened_update): if there are too few images in
+	the document history, use the action's name as its label for the
+	empty slots, to keep the translation of "" from showing up in the
+	shortcut editor.
+
 2006-08-24  Sven Neumann  <sven@gimp.org>
 
 	* desktop/gimp.desktop.in.in (Categories): removed "Application"
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index 7484ea1983..b6dd2f5a75 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -151,7 +151,7 @@ file_actions_setup (GimpActionGroup *group)
       entries[i].name           = g_strdup_printf ("file-open-recent-%02d",
                                                    i + 1);
       entries[i].stock_id       = GTK_STOCK_OPEN;
-      entries[i].label          = "";
+      entries[i].label          = entries[i].name;
       entries[i].tooltip        = NULL;
       entries[i].value          = i;
       entries[i].value_variable = FALSE;
@@ -206,7 +206,7 @@ void
 file_actions_update (GimpActionGroup *group,
                      gpointer         data)
 {
-  GimpImage    *image   = action_data_get_image (data);
+  GimpImage    *image    = action_data_get_image (data);
   GimpDrawable *drawable = NULL;
 
   if (image)
@@ -281,6 +281,8 @@ file_actions_last_opened_update (GimpContainer   *container,
       else
         {
           g_object_set (action,
+                        "label",    name,
+                        "tooltip",  NULL,
                         "visible",  FALSE,
                         "viewable", NULL,
                         NULL);