diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input.c b/legacy/ecore/src/lib/ecore_input/ecore_input.c
index 969f567de1..79f5b438eb 100644
--- a/legacy/ecore/src/lib/ecore_input/ecore_input.c
+++ b/legacy/ecore/src/lib/ecore_input/ecore_input.c
@@ -309,6 +309,8 @@ ecore_event_evas_shutdown(void)
      {
 	int i;
 
+        eina_hash_free(_window_hash);
+        _window_hash = NULL;
 	for (i = 0; i < sizeof(ecore_event_evas_handlers)/sizeof(Ecore_Event_Handler*); ++i)
 	  {
 	     ecore_event_handler_del(ecore_event_evas_handlers[i]);