diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 46284fe01..b09808abe 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -567,7 +567,9 @@ func checkoutRepo(id string) {
 		return
 	}
 
-	FullReindex()
+	task.AppendTask(task.DatabaseIndexFull, fullReindex)
+	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
+	task.AppendTask(task.ReloadUI, util.ReloadUIResetScroll)
 
 	if syncEnabled {
 		func() {
diff --git a/kernel/util/websocket.go b/kernel/util/websocket.go
index 8892f2bb7..6407860f7 100644
--- a/kernel/util/websocket.go
+++ b/kernel/util/websocket.go
@@ -120,8 +120,15 @@ func ClosePushChan(id string) {
 	})
 }
 
+func ReloadUIResetScroll() {
+	evt := NewCmdResult("reloadui", 0, PushModeBroadcast)
+	evt.Data = map[string]interface{}{"resetScroll": true}
+	PushEvent(evt)
+}
+
 func ReloadUI() {
 	evt := NewCmdResult("reloadui", 0, PushModeBroadcast)
+	evt.Data = map[string]interface{}{"dropCurrentLayout": false}
 	PushEvent(evt)
 }