diff --git a/plugins/git4idea/src/git4idea/GitRootConverter.java b/plugins/git4idea/src/git4idea/GitRootConverter.java
index 10c0ffe5b1bb..95aa50319104 100644
--- a/plugins/git4idea/src/git4idea/GitRootConverter.java
+++ b/plugins/git4idea/src/git4idea/GitRootConverter.java
@@ -2,6 +2,7 @@
 
 package git4idea;
 
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
@@ -24,6 +25,7 @@ public class GitRootConverter implements AbstractVcs.RootsConvertor {
     ArrayList<VirtualFile> roots = new ArrayList<>();
     HashSet<VirtualFile> listed = new HashSet<>();
     for (VirtualFile f : result) {
+      ProgressManager.checkCanceled();
       VirtualFile r = GitUtil.gitRootOrNull(f);
       if (r != null && listed.add(r)) {
         roots.add(r);