diff --git a/ChangeLog b/ChangeLog
index 794d24d..a63f8aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-15 ajwillia.ms (Andy Williams)
+
+	* Fix issues with re-opening closed tabs
+
 2015-03-08 ajwillia.ms (Andy Williams)
 
 	* Add a settings screen
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 289926f..2660d1e 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -404,6 +404,7 @@ edi_filepanel_add(Evas_Object *parent, Evas_Object *win,
 
    list = elm_genlist_add(parent);
    elm_genlist_homogeneous_set(list, EINA_TRUE);
+   elm_genlist_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS);
    evas_object_size_hint_min_set(list, 100, -1);
    evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index c9baafa..86be779 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -496,7 +496,7 @@ edi_mainview_close()
    elm_naviframe_item_pop(nf);
    elm_object_item_del(elm_toolbar_selected_item_get(tb));
    _edi_mainview_items = eina_list_remove(_edi_mainview_items, item);
-   eina_stringshare_del(item->path);
+
    free(item);
 }