diff --git a/cli/src/etos_client/downloader/downloader.py b/cli/src/etos_client/downloader/downloader.py
index 8db26b06..5c5328ac 100644
--- a/cli/src/etos_client/downloader/downloader.py
+++ b/cli/src/etos_client/downloader/downloader.py
@@ -120,9 +120,10 @@ def __save_file(self, item: Downloadable, response: requests.Response) -> None:
             with self.__lock:
                 download_path.parent.mkdir(exist_ok=True, parents=True)
         index = 0
+        original_name = download_path.name
         while download_path.exists():
             index += 1
-            download_path = download_path.with_name(f"{index}_{download_path.name}")
+            download_path = download_path.with_name(f"{index}_{original_name}")
         self.logger.debug("Saving file %s", download_path)
         with self.__lock:
             self.downloads.add(str(download_path))