diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index 3fb15fffb..5f4558d08 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -136,6 +136,9 @@ _e_eap_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
    E_FREE(data->wrole);
    E_FREE(data->iclass);
    E_FREE(data->image);
+   if (data->editor->eap->image) evas_stringshare_del(data->editor->eap->image);
+   data->editor->eap->width = 0;
+   data->editor->eap->height = 0;
    e_object_unref(E_OBJECT(data->editor->eap));
    if (data->editor)
      {