diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs
index c000b2a..886bfbd 100644
--- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs
+++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs
@@ -196,11 +196,11 @@ namespace Damage_Calculator
                     continue;
 
                 // Filter file existence
-                if (map.BspFilePath == null && Globals.Settings.ShowMapsMissingBsp == false)
+                if (!map.HasBspFile && !Globals.Settings.ShowMapsMissingBsp)
                     continue;
-                if (map.NavFilePath == null && Globals.Settings.ShowMapsMissingNav == false)
+                if (!map.HasNavFile && !Globals.Settings.ShowMapsMissingNav)
                     continue;
-                if (map.AinFilePath == null && Globals.Settings.ShowMapsMissingAin == false)
+                if (!map.HasAinFile && !Globals.Settings.ShowMapsMissingAin)
                     continue;
 
                 newMap.Tag = map;
diff --git a/Shared/SteamHelpers/SteamHelpers/Models/CsgoMap.cs b/Shared/SteamHelpers/SteamHelpers/Models/CsgoMap.cs
index d9cb898..313899c 100644
--- a/Shared/SteamHelpers/SteamHelpers/Models/CsgoMap.cs
+++ b/Shared/SteamHelpers/SteamHelpers/Models/CsgoMap.cs
@@ -190,6 +190,32 @@ namespace Shared.Models
             }
         }
 
+        /// <summary>
+        /// Gets whether this map has a NAV file associated with it.
+        /// Will only account for BSP-packed NAV file after calling parseBspData().
+        /// </summary>
+        public bool HasNavFile 
+        { 
+            get => this.BspFilePath != null || this.NavFileBspPacked;
+        }
+
+        /// <summary>
+        /// Gets whether this map has a AIN file associated with it.
+        /// Will only account for BSP-packed AIN file after calling parseBspData().
+        /// </summary>
+        public bool HasAinFile
+        {
+            get => this.AinFilePath != null || this.AinFileBspPacked;
+        }
+
+        /// <summary>
+        /// Gets whether this map has a BSP map file associated with it.
+        /// </summary>
+        public bool HasBspFile
+        {
+            get => this.BspFilePath != null;
+        }
+
         public List<PlayerSpawn> SpawnPoints { get; set; } = new List<PlayerSpawn>();
 
         public NavMesh? NavMesh { get; set; }