diff --git a/plugins/git4idea/src/git4idea/roots/GitRootScanner.java b/plugins/git4idea/src/git4idea/roots/GitRootScanner.java
index 047a62cc1c8d..9c0c37bdffca 100644
--- a/plugins/git4idea/src/git4idea/roots/GitRootScanner.java
+++ b/plugins/git4idea/src/git4idea/roots/GitRootScanner.java
@@ -55,6 +55,7 @@ public class GitRootScanner implements BulkFileListener, ModuleRootListener, Dis
       @Override
       public void run() {
         myProjectIsInitialized = true;
+        scanIfReady();
       }
     });
 
@@ -96,6 +97,7 @@ public class GitRootScanner implements BulkFileListener, ModuleRootListener, Dis
   @Override
   public void directoryMappingChanged() {
     myMappingsAreReady = true;
+    scanIfReady();
   }
 
   private void scanIfReady() {