diff --git a/ChangeLog b/ChangeLog
index 4b2d6bd8a5..171e593786 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-16  Emmanuele Bassi  <ebassi@gnome.org>
+	
+	* gtk/gtkrecentchoosermenu.c:
+	(gtk_recent_chooser_menu_add_tip): Apply the tip only
+	if we have a displayable name for the item. (#365031,
+	patch by padraig.obriain(at)sun.com)
+
 2006-11-16  Emmanuele Bassi  <ebassi@gnome.org>
 
 	* gtk/gtkrecentmanager.c: Provide a fast path returning
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 8413633a07..7dbd7999db 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -847,16 +847,18 @@ gtk_recent_chooser_menu_add_tip (GtkRecentChooserMenu *menu,
     return;
   
   path = gtk_recent_info_get_uri_display (info);
-  
-  tip_text = g_strdup_printf (_("Open '%s'"), path);
- 
-  gtk_tooltips_set_tip (priv->tooltips,
-  			item,
-  			tip_text,
-  			NULL);
+  if (path)
+    {
+      tip_text = g_strdup_printf (_("Open '%s'"), path);
 
-  g_free (path);  
-  g_free (tip_text);
+      gtk_tooltips_set_tip (priv->tooltips,
+                            item,
+                            tip_text,
+                            NULL);
+
+      g_free (path);
+      g_free (tip_text);
+    }
 }
 
 static GtkWidget *