diff --git a/src/modules/everything-files/e_mod_main.c b/src/modules/everything-files/e_mod_main.c
index 2e555b63b..276b90f15 100644
--- a/src/modules/everything-files/e_mod_main.c
+++ b/src/modules/everything-files/e_mod_main.c
@@ -655,6 +655,8 @@ _free_files(Plugin *p)
 {
    Evry_Item_File *file;
 
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+   
    if (p->thread)
      ecore_thread_cancel(p->thread);
    p->thread = NULL;
@@ -682,8 +684,6 @@ _finish(Evry_Plugin *plugin)
 	p->thread = NULL;
      }
 
-   EVRY_PLUGIN_ITEMS_CLEAR(p);
-
    _free_files(p);
 
    if (!p->wait_finish)
@@ -745,8 +745,6 @@ _fetch(Evry_Plugin *plugin, const char *input)
 
 	     if (strncmp(p->directory, "/", 1))
 	       return 0;
-
-	     EVRY_PLUGIN_ITEMS_CLEAR(p);
 	     
 	     _free_files(p);