diff --git a/kernel/model/block.go b/kernel/model/block.go
index 7add88011..ae376992e 100644
--- a/kernel/model/block.go
+++ b/kernel/model/block.go
@@ -128,6 +128,8 @@ func TransferBlockRef(fromID, toID string) (err error) {
 	}
 	toRefText := getNodeRefText(toNode)
 
+	util.PushMsg(Conf.Language(116), 7000)
+
 	refIDs, _ := sql.QueryRefIDsByDefID(fromID, false)
 	for _, refID := range refIDs {
 		tree, _ := loadTreeByBlockID(refID)
@@ -150,6 +152,7 @@ func TransferBlockRef(fromID, toID string) (err error) {
 		}
 	}
 
+	sql.WaitForWritingDatabase()
 	util.ReloadUI()
 	return
 }
diff --git a/kernel/model/box.go b/kernel/model/box.go
index 9a11eed7c..b9bb46da4 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -506,7 +506,6 @@ func ReloadUI() {
 
 func FullReindex() {
 	task.PrependTask(task.DatabaseIndexFull, fullReindex)
-	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
 }
 
 func fullReindex() {
@@ -527,6 +526,7 @@ func fullReindex() {
 	sql.EnableCache()
 	treenode.SaveBlockTree(true)
 	LoadFlashcards()
+	IndexRefs()
 	debug.FreeOSMemory()
 	util.ReloadUI()
 }