diff --git a/ChangeLog b/ChangeLog
index df97cebe1..ec53b4da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
         * Fixed bug where disabled slider widgets could be changed with mouse wheel
         * Fixed bug where fileman config slider widgets were not properly disabled
         * Tasks gadgets now apply the selected style
+        * Desktop->Shelves menu now shows shelf names
         * Added elm win trap callback for base size setting, calling this causes ICCCM hints to be applied
 
 2013-01-07 Tom "TAsn" Hacohen
diff --git a/NEWS b/NEWS
index beb403eca..8cbfa9696 100644
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,7 @@ Improvements:
     * Backlight fade time only applies to dimming - undimming is fixed 0.5 .
     * Added elm win trap callback for base size setting, calling this causes ICCCM hints to be applied
     * "System Default" language in wizard now displays which language it is and no longer removes language from list
+    * Desktop->Shelves menu now shows shelf names
 
 Fixes:
     * Force check changed upon confirmation dialog closure for engine settings.
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 2a6ba3d01..30ae30649 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1613,16 +1613,22 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
    EINA_LIST_FOREACH(shelves, l, es)
      {
         char buf[1024];
+        const char *name;
 
         if (!es) continue;
         if (es->zone->num != zone->num) continue;
         if (es->cfg->container != (int)con->num) continue;
 
-        snprintf(buf, sizeof(buf), _("Shelf %s"),
-                 e_shelf_orient_string_get(es));
+        if (es->name)
+          name = es->name;
+        else
+          {
+             name = buf;
+             snprintf(buf, sizeof(buf), _("Shelf %s"), e_shelf_orient_string_get(es));
+          }
 
         mi = e_menu_item_new(m);
-        e_menu_item_label_set(mi, buf);
+        e_menu_item_label_set(mi, name);
         e_menu_item_callback_set(mi, _e_int_menus_shelves_item_cb, es);
         switch (es->cfg->orient)
           {