diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 9208e70..982275a 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -406,6 +406,9 @@ _item_menu_create(Evas_Object *win, Edi_Dir_Data *sd)
    menu = elm_menu_add(win);
    evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, NULL);
 
+   elm_menu_item_add(menu, NULL, "document-properties", basename((char *)sd->path), NULL, NULL);
+   elm_menu_item_separator_add(menu, NULL);
+
    elm_menu_item_add(menu, NULL, "fileopen", _("Open"), _item_menu_open_cb, sd);
    elm_menu_item_add(menu, NULL, "window-new", _("Open in New Window"), _item_menu_open_window_cb, sd);
 
@@ -509,6 +512,9 @@ _item_menu_dir_create(Evas_Object *win, Edi_Dir_Data *sd)
    menu = elm_menu_add(win);
    evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, NULL);
 
+   elm_menu_item_add(menu, NULL, "document-properties", basename((char *)sd->path), NULL, NULL);
+   elm_menu_item_separator_add(menu, NULL);
+
    elm_menu_item_add(menu, NULL, "document-new", _("Create File here"), _item_menu_create_file_cb, sd);
    elm_menu_item_add(menu, NULL, "folder-new", _("Create Directory here"), _item_menu_create_dir_cb, sd);
    if (ecore_file_app_installed("terminology"))
@@ -530,6 +536,7 @@ _item_clicked_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
    Elm_Object_Item *it;
    Edi_Dir_Data *sd;
 
+
    ev = event_info;
    it = elm_genlist_at_xy_item_get(obj, ev->output.x, ev->output.y, NULL);
    sd = elm_object_item_data_get(it);
@@ -557,8 +564,6 @@ _item_clicked_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
    else
      _item_menu_create(_main_win, sd);
 
-   elm_object_item_focus_set(it, EINA_TRUE);
-
    elm_menu_move(menu, ev->canvas.x, ev->canvas.y);
    evas_object_show(menu);
 }
@@ -1064,6 +1069,7 @@ edi_filepanel_add(Evas_Object *parent, Evas_Object *win,
    elm_object_part_content_set(cancel, "icon", icon);
 
    _list = list = elm_genlist_add(parent);
+   elm_object_focus_allow_set(_list, EINA_FALSE);
    elm_genlist_homogeneous_set(list, EINA_TRUE);
    elm_genlist_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS);
    elm_genlist_filter_set(list, "");