diff --git a/program/js/treelist.js b/program/js/treelist.js
index 9e6baabd3..6850fdcf2 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -583,10 +583,11 @@ function rcube_treelist_widget(node, p)
     // search recursively in tree (to keep sorting order)
     search_tree(data);
     search_active = true;
-    last_search = q;
 
     me.triggerEvent('search', { query: q, last: last_search, count: hits.length, ids: hits, execute: enter||false });
 
+    last_search = q;
+
     return hits.count;
   }