diff --git a/product/ERP5/ERP5Site.py b/product/ERP5/ERP5Site.py
index 7a4e7b4b3a6a619696e8141b735ffd5a71714225..ac1149154b30edb72851fd52181c38403f6845cf 100644
--- a/product/ERP5/ERP5Site.py
+++ b/product/ERP5/ERP5Site.py
@@ -2208,6 +2208,12 @@ class ERP5Generator(PortalGenerator):
       addERP5Tool(p, 'portal_activities', 'Activity Tool')
       # Initialize Activities
       p.portal_activities.manageClearActivities()
+      # Reindex already existing tools
+      for e in p.objectValues():
+        try:
+          e.reindexObject()
+        except TypeError:
+          pass
 
     if not p.hasObject('content_type_registry'):
       self.setupMimetypes(p)