diff --git a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
index 0d050c2a7065..58f1c250a4b7 100644
--- a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
@@ -196,7 +196,11 @@ public class GitRootTracker implements VcsListener {
    * {@inheritDoc}
    */
   public void directoryMappingChanged() {
-    scheduleRootsCheck(true);
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
+      public void run() {
+        scheduleRootsCheck(true);
+      }
+    });
   }
 
   private void scheduleRootsCheck(final boolean rootsChanged) {