diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e801958..89c1b190 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Status of the `main` branch. Changes prior to the next official version change will appear here.
 
+Fixes:
+* Ignore `.git` in check for ignored paths and improve performance of `find_all_non_ignored_files`
+
 # 0.1.3
 
 ## Summary
diff --git a/src/serena/util/file_system.py b/src/serena/util/file_system.py
index 0999aef1..327a2236 100644
--- a/src/serena/util/file_system.py
+++ b/src/serena/util/file_system.py
@@ -3,6 +3,7 @@ import logging
 import os
 from collections.abc import Callable
 from dataclasses import dataclass, field
+from pathlib import Path
 from typing import NamedTuple
 
 import pathspec
@@ -258,6 +259,11 @@ class GitignoreParser:
         else:
             rel_path = path
 
+        # Ignore paths inside .git
+        rel_path_first_path = Path(rel_path).parts[0]
+        if rel_path_first_path == ".git":
+            return True
+
         abs_path = os.path.join(self.repo_root, rel_path)
 
         # Normalize path separators