diff --git a/kernel/model/box.go b/kernel/model/box.go
index 1a069cb00..7b1ee0b44 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -476,13 +476,13 @@ func ReindexTree(path string) (err error) {
 func RefreshFileTree() {
 	WaitForWritingFiles()
 
+	util.PushEndlessProgress(Conf.Language(35))
 	if err := sql.InitDatabase(true); nil != err {
 		util.PushErrMsg(fmt.Sprintf(Conf.Language(85), err), 5000)
 		return
 	}
 	treenode.InitBlockTree(true)
 
-	util.PushEndlessProgress(Conf.Language(35))
 	openedBoxes := Conf.GetOpenedBoxes()
 	for _, openedBox := range openedBoxes {
 		openedBox.Index(true)
diff --git a/kernel/sql/database.go b/kernel/sql/database.go
index b1d4d57f5..69a837545 100644
--- a/kernel/sql/database.go
+++ b/kernel/sql/database.go
@@ -59,6 +59,10 @@ func init() {
 func InitDatabase(forceRebuild bool) (err error) {
 	util.IncBootProgress(2, "Initializing database...")
 
+	if forceRebuild {
+		WaitForWritingDatabase()
+	}
+
 	initDBConnection()
 
 	if !forceRebuild {