diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index dd8abfa98..849270b06 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -20,6 +20,7 @@ static Eina_Bool    _e_shelf_cb_mouse_in(void *data, int type, void *event);
 static Eina_Bool    _e_shelf_cb_mouse_out(void *data, int type, void *event);
 static void          _e_shelf_cb_mouse_out2(E_Shelf *es, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Out *ev);
 static int          _e_shelf_cb_id_sort(const void *data1, const void *data2);
+static void         _e_shelf_cb_menu_rename(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__);
 static Eina_Bool    _e_shelf_cb_hide_animator(void *data);
 static Eina_Bool    _e_shelf_cb_hide_animator_timer(void *data);
 static Eina_Bool    _e_shelf_cb_hide_urgent_timer(void *data);
@@ -289,6 +290,14 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
    return es;
 }
 
+EAPI void
+e_shelf_rename_dialog(E_Shelf *es)
+{
+   if (!es) return;
+   if (es->rename_dialog) return;
+   _e_shelf_cb_menu_rename(es, NULL, NULL);
+}
+
 EAPI void
 e_shelf_zone_move_resize_handle(E_Zone *zone)
 {
@@ -1888,6 +1897,44 @@ _e_shelf_cb_instant_hide_timer(void *data)
    return ECORE_CALLBACK_CANCEL;
 }
 
+static void
+_e_shelf_cb_menu_rename_yes_cb(char *text, void *data)
+{
+   E_Shelf *es = e_object_data_get(data);
+   Eina_List *l;
+   E_Config_Shelf *cf_es;
+
+   EINA_LIST_FOREACH(e_config->shelves, l, cf_es)
+     if ((!strcmp(cf_es->name, text)) && (cf_es->id == es->id))
+       {
+          e_util_dialog_internal(_("Error"), _("A shelf with that name and id already exists!"));
+          return;
+       }
+   e_shelf_name_set(es, text);
+   e_config_save_queue();
+}
+
+static void
+_e_shelf_cb_menu_rename_cb(void *data)
+{
+   E_Shelf *es = e_object_data_get(data);
+   es->rename_dialog = NULL;
+}
+
+static void
+_e_shelf_cb_menu_rename(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
+{
+   E_Shelf *es = data;
+   if (es->rename_dialog) return;
+   es->rename_dialog = e_entry_dialog_show(_("Rename Shelf"), "edit-rename",
+                                          _("Name:"), es->name, NULL, NULL,
+                                          _e_shelf_cb_menu_rename_yes_cb,
+                                          NULL, es);
+   E_OBJECT(es->rename_dialog)->data = es;
+   e_object_del_attach_func_set(E_OBJECT(es->rename_dialog),
+                                _e_shelf_cb_menu_rename_cb);
+}
+
 static void
 _e_shelf_menu_pre_cb(void *data, E_Menu *m)
 {
@@ -1921,6 +1968,11 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Rename"));
+   e_util_menu_item_theme_icon_set(mi, "edit-rename");
+   e_menu_item_callback_set(mi, _e_shelf_cb_menu_rename, es);
+
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Delete"));
    e_util_menu_item_theme_icon_set(mi, "list-remove");
diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h
index 2c210c4a4..ba00fce09 100644
--- a/src/bin/e_shelf.h
+++ b/src/bin/e_shelf.h
@@ -27,6 +27,7 @@ struct _E_Shelf
    E_Config_Shelf      *cfg;
    int                  size;
    E_Config_Dialog     *config_dialog;
+   E_Entry_Dialog      *rename_dialog;
    E_Menu              *menu;
    Ecore_Timer         *hide_timer;
    Ecore_Animator      *hide_animator;
@@ -83,6 +84,7 @@ EAPI void             e_shelf_style_set(E_Shelf *es, const char *style);
 EAPI void             e_shelf_popup_set(E_Shelf *es, int popup);
 EAPI E_Shelf         *e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es);
 EAPI void             e_shelf_name_set(E_Shelf *es, const char *name);
+EAPI void             e_shelf_rename_dialog(E_Shelf *es);
 
 #endif
 #endif