diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
index d305c115c2..7fa61ef4de 100644
--- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
+++ b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
@@ -639,10 +639,10 @@ ecore_directfb_window_fullscreen_set(Ecore_DirectFB_Window *ecore_window, int on
 	}
 	else
 	{
+		ecore_main_fd_handler_del(_input_event_fd_handler_handle);
 		DFBCHECK(_input_event->Release(_input_event));	
 		DFBCHECK(_layer->SetCooperativeLevel(_layer,DLSCL_SHARED));
 		DFBCHECK(ecore_window->window->GetSurface(ecore_window->window, &ecore_window->surface));
-		ecore_main_fd_handler_del(_input_event_fd_handler_handle);
 		_ecore_directfb_fullscreen_window_id = 0;
 	}
 		
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c
index 91f2ac1852..aa8190e0ca 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c
+++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c
@@ -293,9 +293,9 @@ ecore_fb_kbd_init(void)
 void
 ecore_fb_kbd_shutdown(void)
 {
-   if (_ecore_fb_kbd_fd >= 0) close(_ecore_fb_kbd_fd);
    if (_ecore_fb_kbd_fd_handler_handle) 
      ecore_main_fd_handler_del(_ecore_fb_kbd_fd_handler_handle);
+   if (_ecore_fb_kbd_fd >= 0) close(_ecore_fb_kbd_fd);
    _ecore_fb_kbd_fd = 0;
    _ecore_fb_kbd_fd_handler_handle = NULL;
    _ecore_fb_ctrl = 0;
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c
index 4d002a2e2b..be08da6900 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c
+++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c
@@ -130,9 +130,9 @@ ecore_fb_ts_init(void)
 EAPI void
 ecore_fb_ts_shutdown(void)
 {
-   if (_ecore_fb_ts_fd >= 0) close(_ecore_fb_ts_fd);
    if (_ecore_fb_ts_fd_handler_handle)
      ecore_main_fd_handler_del(_ecore_fb_ts_fd_handler_handle);
+   if (_ecore_fb_ts_fd >= 0) close(_ecore_fb_ts_fd);
    _ecore_fb_ts_fd = -1;
    _ecore_fb_ts_fd_handler_handle = NULL;
 }