diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json
index 60a2a08d7..dd63d64f2 100644
--- a/app/appearance/langs/de_DE.json
+++ b/app/appearance/langs/de_DE.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Es kann jeweils nur ein Dokument konvertiert werden",
   "empty": "Leer",
   "newRowInRelation": "Erstellen Sie einen neuen Eintrag in ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Primärschlüsseltext kopieren",
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index a68c4586d..d9fc82c34 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Only one document can be converted at a time",
   "empty": "Empty",
   "newRowInRelation": "Create a new entry in ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copy primary key text",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index e239591e6..3797cdff4 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Solo se puede convertir un documento a la vez",
   "empty": "Vacío",
   "newRowInRelation": "Crear una nueva entrada en ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copiar texto de la clave principal",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index b5e8c47b7..d7ade14a8 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Vous ne pouvez convertir qu'un seul document à la fois",
   "empty": "Vide",
   "newRowInRelation": "Créer une nouvelle entrée dans ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copier le texte de la clé principale",
diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json
index 206e4e720..f506c0a91 100644
--- a/app/appearance/langs/he_IL.json
+++ b/app/appearance/langs/he_IL.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "ניתן להמיר רק מסמך אחד בכל פעם",
   "empty": "ריק",
   "newRowInRelation": "צור ערך חדש ב-${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "העתק טקסט מפתח ראשי",
diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json
index 2e6216743..658fc94a8 100644
--- a/app/appearance/langs/it_IT.json
+++ b/app/appearance/langs/it_IT.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "È possibile convertire solo un documento alla volta",
   "empty": "Vuoto",
   "newRowInRelation": "Crea una nuova voce in ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copia il testo della chiave primaria",
diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
index 758251cd3..a751003bd 100644
--- a/app/appearance/langs/ja_JP.json
+++ b/app/appearance/langs/ja_JP.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "一度に変換できるドキュメントは1つだけです",
   "empty": "空白",
   "newRowInRelation": "${x} に新しい項目を作成 <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "主キーのテキストをコピー",
diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json
index 950adc47f..d65672a72 100644
--- a/app/appearance/langs/pl_PL.json
+++ b/app/appearance/langs/pl_PL.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Można konwertować tylko jeden dokument na raz",
   "empty": "Pusty",
   "newRowInRelation": "Utwórz nowy wpis w ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Skopiuj tekst klucza głównego",
diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json
index fd990e95d..992b5a6eb 100644
--- a/app/appearance/langs/ru_RU.json
+++ b/app/appearance/langs/ru_RU.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Можно конвертировать только один документ за раз",
   "empty": "Пусто",
   "newRowInRelation": "Создать новую запись в ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Скопировать текст основного ключа",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 3e3e529cd..525edf846 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "每次只能轉換一個文檔",
   "empty": "空白",
   "newRowInRelation": "在 ${x} 中新建條目 <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "複製主鍵文本",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 341cd087f..ab8073fb6 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "每次只能转换一个文档",
   "empty": "空白",
   "newRowInRelation": "在 ${x} 中新建条目 <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "复制主键文本",
diff --git a/kernel/model/heading.go b/kernel/model/heading.go
index f0675beab..85219079d 100644
--- a/kernel/model/heading.go
+++ b/kernel/model/heading.go
@@ -122,6 +122,8 @@ func Doc2Heading(srcID, targetID string, after bool) (srcTreeBox, srcTreePath st
 		return
 	}
 
+	FlushTxQueue()
+
 	srcTree, _ := LoadTreeByBlockID(srcID)
 	if nil == srcTree {
 		err = ErrBlockNotFound
@@ -274,6 +276,8 @@ func Doc2Heading(srcID, targetID string, after bool) (srcTreeBox, srcTreePath st
 }
 
 func Heading2Doc(srcHeadingID, targetBoxID, targetPath, previousPath string) (srcRootBlockID, newTargetPath string, err error) {
+	FlushTxQueue()
+
 	srcTree, _ := LoadTreeByBlockID(srcHeadingID)
 	if nil == srcTree {
 		err = ErrBlockNotFound
diff --git a/kernel/model/listitem.go b/kernel/model/listitem.go
index 5c23ed43d..e2f97b27b 100644
--- a/kernel/model/listitem.go
+++ b/kernel/model/listitem.go
@@ -28,6 +28,8 @@ import (
 )
 
 func ListItem2Doc(srcListItemID, targetBoxID, targetPath, previousPath string) (srcRootBlockID, newTargetPath string, err error) {
+	FlushTxQueue()
+
 	srcTree, _ := LoadTreeByBlockID(srcListItemID)
 	if nil == srcTree {
 		err = ErrBlockNotFound