diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
index f4f59966d1..946dc4af8d 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
@@ -677,13 +677,13 @@ _ecore_x_shutdown(int close_display)
 
    if (!_ecore_xcb_conn) return _ecore_xcb_init_count;
 
+   ecore_main_fd_handler_del(_ecore_xcb_fd_handler_handle);
    if (close_display)
       xcb_disconnect(_ecore_xcb_conn);
    else
       close(xcb_get_file_descriptor(_ecore_xcb_conn));
    ecore_event_shutdown();
    free(_ecore_xcb_event_handlers);
-   ecore_main_fd_handler_del(_ecore_xcb_fd_handler_handle);
    ecore_event_filter_del(_ecore_xcb_filter_handler);
    _ecore_xcb_fd_handler_handle = NULL;
    _ecore_xcb_filter_handler = NULL;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
index 486f64d9be..999c197327 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
@@ -669,13 +669,13 @@ _ecore_x_shutdown(int close_display)
      }
 
 #endif
+   ecore_main_fd_handler_del(_ecore_x_fd_handler_handle);
    if (close_display)
       XCloseDisplay(_ecore_x_disp);
    else
       close(ConnectionNumber(_ecore_x_disp));
 
    free(_ecore_x_event_handlers);
-   ecore_main_fd_handler_del(_ecore_x_fd_handler_handle);
    _ecore_x_fd_handler_handle = NULL;
    _ecore_x_disp = NULL;
    _ecore_x_event_handlers = NULL;