diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index fb982a3b8..c11354248 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2810,8 +2810,8 @@ bookmarks_check_remove_sensitivity (GtkFileChooserDefault *impl)
 {
   GtkTreeIter iter;
   gboolean removable = FALSE;
+  gboolean have_name = FALSE;
   gchar *name = NULL;
-  gchar *tip;
   
   if (shortcuts_get_selected (impl, &iter))
     {
@@ -2821,6 +2821,13 @@ bookmarks_check_remove_sensitivity (GtkFileChooserDefault *impl)
                           -1);
       gtk_widget_set_sensitive (impl->browse_shortcuts_remove_button, removable);
 
+      have_name = name != NULL && name[0] != '\0';
+    }
+
+  if (have_name)
+    {
+      char *tip;
+
       if (removable)
         tip = g_strdup_printf (_("Remove the bookmark '%s'"), name);
       else