diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c
index 230eec2..6e70ebe 100644
--- a/src/bin/file_mgr.c
+++ b/src/bin/file_mgr.c
@@ -55,7 +55,6 @@ warning_replace_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
 {
    file_mgr_data *fmd = data;
    enventor_object_file_set(fmd->enventor, config_edc_path_get());
-   enventor_object_modified_set(fmd->enventor, EINA_FALSE);
    warning_close(fmd);
 }
 
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 4ad0816..f8b7eab 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -424,9 +424,6 @@ fileselector_save_done_cb(void *data, Evas_Object *obj, void *event_info)
         return;
      }
 
-   //Update the edc file and try to save.
-   if (strcmp(config_edc_path_get(), selected))
-     enventor_object_modified_set(md->enventor, EINA_TRUE);
    config_edc_path_set(selected);
 
    Eina_List *list = eina_list_append(NULL, config_edj_path_get());
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 89b6d92..1b2fa6c 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -531,6 +531,8 @@ EOLIAN static Eina_Bool
 _enventor_object_save(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd,
                       const char *file)
 {
+   //Update edc file and try to save if the edc path is different.
+   if (build_edc_path_get() != file) edit_changed_set(pd->ed, EINA_TRUE);
    return edit_save(pd->ed, file);
 }