diff --git a/gramps/plugins/db/dbapi/dbapi.py b/gramps/plugins/db/dbapi/dbapi.py
index 42429e262..ca28a5391 100644
--- a/gramps/plugins/db/dbapi/dbapi.py
+++ b/gramps/plugins/db/dbapi/dbapi.py
@@ -813,15 +813,33 @@ class DBAPI(DbGeneric):
                              ref_class_name])
         callback(5)
 
-    def rebuild_secondary(self, update):
+    def rebuild_secondary(self, callback=None):
         """
         Rebuild secondary indices
         """
+        if self.readonly:
+            return
+
         # First, expand blob to individual fields:
-        self._update_secondary_values()
+        self._txn_begin()
+        index = 1
+        for obj_type in ('Person', 'Family', 'Event', 'Place', 'Repository',
+                         'Source', 'Citation', 'Media', 'Note', 'Tag'):
+            for handle in self.method('get_%s_handles', obj_type)():
+                obj = self.method('get_%s_from_handle', obj_type)(handle)
+                self._update_secondary_values(obj)
+            if callback:
+                callback(index)
+            index += 1
+        self._txn_commit()
+        if callback:
+            callback(11)
+
         # Next, rebuild stats:
         gstats = self.get_gender_stats()
         self.genderStats = GenderStats(gstats)
+        if callback:
+            callback(12)
 
     def _has_handle(self, obj_key, handle):
         table = KEY_TO_NAME_MAP[obj_key]
diff --git a/gramps/plugins/tool/rebuild.py b/gramps/plugins/tool/rebuild.py
index 6d26eee1f..11ed7cbd4 100644
--- a/gramps/plugins/tool/rebuild.py
+++ b/gramps/plugins/tool/rebuild.py
@@ -92,6 +92,7 @@ class Rebuild(tool.Tool, UpdateCallback):
             print("All secondary indexes have been rebuilt.")
 
         self.db.enable_signals()
+        self.db.request_rebuild()
 
 #------------------------------------------------------------------------
 #