diff --git a/libgimp/gimpitemcombobox.c b/libgimp/gimpitemcombobox.c
index 02f555292d..5cb5f693a4 100644
--- a/libgimp/gimpitemcombobox.c
+++ b/libgimp/gimpitemcombobox.c
@@ -421,15 +421,10 @@ gimp_item_combo_box_model_add (GtkListStore           *store,
       if (! constraint || (* constraint) (image, items[i], data))
         {
           gchar     *image_name = gimp_image_get_name (image);
-          gchar     *item_name;
+          gchar     *item_name  = gimp_item_get_name (items[i]);
           gchar     *label;
           GdkPixbuf *thumb;
 
-          if (type == VECTORS_COMBO_BOX)
-            item_name = gimp_vectors_get_name (items[i]);
-          else
-            item_name = gimp_drawable_get_name (items[i]);
-
           label = g_strdup_printf ("%s-%d/%s-%d",
                                    image_name, image,
                                    item_name, items[i]);