2 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 2ef86cfaa1..c56b181528 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -116,7 +116,7 @@ extern EAPI double _elm_startup_time;
                              { EFL_LOOP_EVENT_ARGUMENTS, efl_main },    \
                              { EFL_LOOP_EVENT_PAUSE, efl_pause },       \
                              { EFL_LOOP_EVENT_RESUME, efl_resume },     \
-                             { EFL_EVENT_DEL, efl_terminate });         \
+                             { EFL_LOOP_EVENT_TERMINATE, efl_terminate });         \
   int main(int argc, char **argv)                                       \
   {                                                                     \
      int ret__;                                                         \
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 196f5b5bbc..0bf8fe41ca 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -435,6 +435,8 @@ elm_shutdown(void)
    _elm_init_count--;
    if (_elm_init_count > 0) return _elm_init_count;
 
+   efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, NULL);
+
    ecore_event_handler_del(system_handlers[0]);
    ecore_event_handler_del(system_handlers[1]);