diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c
index 2f4f0b1f8..1b6ccc841 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -451,6 +451,8 @@ xwl_shutdown(void)
    if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr);
 
    free(exs);
+   e_comp_x_shutdown();
+   ecore_x_shutdown();
    e_util_env_set("DISPLAY", NULL);
 }