diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index dd62b96..f845c8a 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -46,18 +46,7 @@ config_edj_path_update(config_data *cd)
    char buf[PATH_MAX];
    Eina_Tmpstr *tmp_path;
 
-   char *ext = strstr(cd->edc_path, ".edc");
-   const char *file = ecore_file_file_get(cd->edc_path);
-   if (ext && file)
-     {
-        char filename[PATH_MAX];
-        snprintf(filename, (ext - file) + 1, "%s", file);
-        snprintf(buf, sizeof(buf), "%s.edj", filename);
-     }
-   else
-     snprintf(buf, sizeof(buf), "%s.edj", file);
-
-   if (!eina_file_mkstemp(buf, &tmp_path))
+   if (!eina_file_mkstemp(DEFAULT_EDC_FORMAT, &tmp_path))
      {
         EINA_LOG_ERR("Failed to generate tmp folder!");
         return;
diff --git a/src/bin/menu.c b/src/bin/menu.c
index f8b7eab..6a4bba2 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -503,6 +503,11 @@ fileselector_load_done_cb(void *data, Evas_Object *obj, void *event_info)
         return;
      }
    config_edc_path_set(selected);
+
+   Eina_List *list = eina_list_append(NULL, config_edj_path_get());
+   enventor_object_path_set(md->enventor, ENVENTOR_OUT_EDJ, list);
+   eina_list_free(list);
+
    enventor_object_file_set(md->enventor, selected);
    base_title_set(selected);
    fileselector_close(md);