diff --git a/NickvisionTagger.Shared/Models/MusicFile.cs b/NickvisionTagger.Shared/Models/MusicFile.cs
index 0f64706c..2ba8c7fe 100644
--- a/NickvisionTagger.Shared/Models/MusicFile.cs
+++ b/NickvisionTagger.Shared/Models/MusicFile.cs
@@ -542,11 +542,15 @@ public bool SaveTagToDisk(bool preserveModificationTimestamp)
             {
                 var newPath = $"{System.IO.Path.GetDirectoryName(Path)}{System.IO.Path.DirectorySeparatorChar}{Filename}";
                 Directory.CreateDirectory(System.IO.Path.GetDirectoryName(newPath)!);
-                var i = 1;
+                if(File.Exists(newPath))
+                {
+                    newPath = newPath.Remove(newPath.IndexOf(_dotExtension)) + $" (1){_dotExtension}";
+                }
+                var i = 2;
                 while (File.Exists(newPath))
                 {
-                    var oldNumber = $" ({i - 1})";
-                    newPath = newPath.Remove(newPath.IndexOf(oldNumber), oldNumber.Length) + $" ({i})";
+                    newPath = newPath.Remove(newPath.IndexOf($" ({i - 1})")) + $" ({i}){_dotExtension}";
+                    i++;
                 }
                 File.Move(Path, newPath);
                 Path = newPath;