diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py
index 8e5c60128a..680380a756 100644
--- a/src/calibre/gui2/tag_browser/ui.py
+++ b/src/calibre/gui2/tag_browser/ui.py
@@ -282,23 +282,22 @@ class TagBrowserMixin(object):  # {{{
 
         db = self.library_view.model().db
         editor = EditAuthorsDialog(parent, db, id_, select_sort, select_link)
-        d = editor.exec_()
-        if d:
+        if editor.exec_() == editor.Accepted:
             # Save and restore the current selections. Note that some changes
             # will cause sort orders to change, so don't bother with attempting
             # to restore the position. Restoring the state has the side effect
             # of refreshing book details.
             with self.library_view.preserve_state(preserve_hpos=False, preserve_vpos=False):
-                for (id2, old_author, new_author, new_sort, new_link) in editor.result:
-                    if old_author != new_author:
-                        # The id might change if the new author already exists
-                        id2 = db.rename_author(id2, new_author)
-                    db.set_sort_field_for_author(id2, unicode(new_sort),
-                                                 commit=False, notify=False)
-                    db.set_link_field_for_author(id2, unicode(new_link),
-                                                 commit=False, notify=False)
-                db.commit()
-                self.library_view.model().refresh()
+                affected_books, id_map = set(), {}
+                db = db.new_api
+                rename_map = {author_id:new_author for author_id, old_author, new_author, new_sort, new_link in editor.result if old_author != new_author}
+                if rename_map:
+                    affected_books, id_map = db.rename_items('authors', rename_map)
+                link_map = {id_map.get(author_id, author_id):new_link for author_id, old_author, new_author, new_sort, new_link in editor.result}
+                affected_books |= db.set_link_for_authors(link_map)
+                sort_map = {id_map.get(author_id, author_id):new_sort for author_id, old_author, new_author, new_sort, new_link in editor.result}
+                affected_books |= db.set_sort_for_authors(sort_map)
+                self.library_view.model().refresh_ids(affected_books, current_row=self.library_view.currentIndex().row())
                 self.tags_view.recount()
 
     def drag_drop_finished(self, ids):