diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt
index 268476e51a5f..4aef2728d808 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt
@@ -1025,6 +1025,10 @@ class LineStatusTrackerManager(
 
   @TestOnly
   fun waitUntilBaseContentsLoaded() {
+    if (ApplicationManager.getApplication().isDispatchThread) {
+      UIUtil.dispatchAllInvocationEvents()
+    }
+
     val semaphore = Semaphore()
     semaphore.down()