diff --git a/custom_components/hacs/repositories/plugin.py b/custom_components/hacs/repositories/plugin.py
index d7f22839594..765bb64c827 100644
--- a/custom_components/hacs/repositories/plugin.py
+++ b/custom_components/hacs/repositories/plugin.py
@@ -99,9 +99,9 @@ async def get_package_content(self):
 
     def update_filenames(self) -> None:
         """Get the filename to target."""
-        # Handler for plug requirement 3
-        if self.repository_manifest.filename:
-            valid_filenames = (self.repository_manifest.filename,)
+        content_in_root = self.repository_manifest.content_in_root
+        if specific_filename := self.repository_manifest.filename:
+            valid_filenames = (specific_filename,)
         else:
             valid_filenames = (
                 f"{self.data.name.replace('lovelace-', '')}.js",
@@ -110,7 +110,7 @@ def update_filenames(self) -> None:
                 f"{self.data.name}-bundle.js",
             )
 
-        if not self.repository_manifest.content_in_root:
+        if not content_in_root:
             if self.releases.objects:
                 release = self.releases.objects[0]
                 if release.assets:
@@ -124,11 +124,13 @@ def update_filenames(self) -> None:
                         self.content.path.remote = "release"
                         return
 
-        for location in ("",) if self.repository_manifest.content_in_root else ("dist", ""):
-            for filename in valid_filenames:
-                if f"{location+'/' if location else ''}{filename}" in [
-                    x.full_path for x in self.tree
-                ]:
-                    self.data.file_name = filename.split("/")[-1]
-                    self.content.path.remote = location
-                    break
+        all_paths = {x.full_path for x in self.tree}
+        for filename in valid_filenames:
+            if filename in all_paths:
+                self.data.file_name = filename
+                self.content.path.remote = ""
+                return
+            if not content_in_root and f"dist/{filename}" in all_paths:
+                self.data.file_name = filename.split("/")[-1]
+                self.content.path.remote = "dist"
+                return