diff --git a/ChangeLog b/ChangeLog
index 6a1414ad9e..893598b959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-17  Emmanuele Bassi  <ebassi@gnome.org>
+
+	* gtk/gtkrecentmanager.c:
+	(gtk_recent_manager_remove_item): Consistently use the same
+	error when removing a URI from an empty GtkRecentManager.
+
 2008-06-17  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkfilechooserdefault.c: remove static integer variables
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index b7820c42f9..02497225a4 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1007,9 +1007,9 @@ gtk_recent_manager_remove_item (GtkRecentManager  *manager,
       priv->recent_items = g_bookmark_file_new ();
       priv->size = 0;
 
-      g_set_error (error, GTK_RECENT_MANAGER_ERROR,
-		   GTK_RECENT_MANAGER_ERROR_NOT_FOUND,
-		   _("Unable to find an item with URI '%s'"),
+      g_set_error (error, G_BOOKMARK_FILE_ERROR,
+		   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
+		   _("No bookmark found for URI '%s'"),
 		   uri);
 
       return FALSE;