diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java
index 038ac6e059b4..a6d53798ac1a 100644
--- a/plugins/git4idea/src/git4idea/GitUtil.java
+++ b/plugins/git4idea/src/git4idea/GitUtil.java
@@ -368,8 +368,9 @@ public class GitUtil {
   public static VirtualFile getGitRootOrNull(@NotNull final FilePath filePath) {
     File root = filePath.getIOFile();
     while (root != null) {
-      File gitDir = findGitDir(root);
-      if (gitDir != null) return LocalFileSystem.getInstance().findFileByIoFile(root);
+      if (isGitRoot(root)) {
+        return LocalFileSystem.getInstance().findFileByIoFile(root);
+      }
       root = root.getParentFile();
     }
     return null;