diff --git a/plugins/git4idea/src/git4idea/repo/GitUntrackedFilesHolder.java b/plugins/git4idea/src/git4idea/repo/GitUntrackedFilesHolder.java
index 356ba991486b..feabdb62c367 100644
--- a/plugins/git4idea/src/git4idea/repo/GitUntrackedFilesHolder.java
+++ b/plugins/git4idea/src/git4idea/repo/GitUntrackedFilesHolder.java
@@ -104,8 +104,10 @@ public class GitUntrackedFilesHolder implements Disposable, BulkFileListener {
   }
 
   void setupVfsListener(@NotNull Project project) {
-    MessageBusConnection connection = project.getMessageBus().connect(this);
-    connection.subscribe(VirtualFileManager.VFS_CHANGES, this);
+    if (!project.isDisposed()) {
+      MessageBusConnection connection = project.getMessageBus().connect(this);
+      connection.subscribe(VirtualFileManager.VFS_CHANGES, this);
+    }
   }
 
   @Override