diff --git a/ShareX.HelpersLib/Helpers/Helpers.cs b/ShareX.HelpersLib/Helpers/Helpers.cs
index d1a8c17b1..12a63b629 100644
--- a/ShareX.HelpersLib/Helpers/Helpers.cs
+++ b/ShareX.HelpersLib/Helpers/Helpers.cs
@@ -152,17 +152,19 @@ public static string GetFilenameSafe(string filePath)
             return filePath;
         }
 
-        public static string ChangeFilenameExtension(string filePath, string extension)
+        public static string ChangeFilenameExtension(string fileName, string extension)
         {
-            if (!string.IsNullOrEmpty(filePath) && !string.IsNullOrEmpty(extension))
+            if (!string.IsNullOrEmpty(fileName))
             {
-                int pos = filePath.LastIndexOf('.');
+                int pos = fileName.LastIndexOf('.');
 
                 if (pos >= 0)
                 {
-                    filePath = filePath.Remove(pos);
+                    fileName = fileName.Remove(pos);
+                }
 
-                    extension = extension.Trim();
+                if (!string.IsNullOrEmpty(extension))
+                {
                     pos = extension.LastIndexOf('.');
 
                     if (pos >= 0)
@@ -170,11 +172,11 @@ public static string ChangeFilenameExtension(string filePath, string extension)
                         extension = extension.Substring(pos + 1);
                     }
 
-                    return filePath + "." + extension;
+                    return fileName + "." + extension;
                 }
             }
 
-            return filePath;
+            return fileName;
         }
 
         public static string AppendExtension(string filePath, string extension)
diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs
index 13e95b1f3..b5d00b64f 100644
--- a/ShareX/WorkerTask.cs
+++ b/ShareX/WorkerTask.cs
@@ -733,14 +733,8 @@ private void DoFileJobs()
                             Info.FilePath = fileAction.Run(Info.FilePath);
                         }
 
-                        if (Path.HasExtension(Info.FilePath))
-                        {
-                            Info.FileName = Path.ChangeExtension(fileName, Path.GetExtension(Info.FilePath));
-                        }
-                        else
-                        {
-                            Info.FileName = Path.GetFileNameWithoutExtension(fileName);
-                        }
+                        string extension = Helpers.GetFilenameExtension(Info.FilePath);
+                        fileName = Helpers.ChangeFilenameExtension(fileName, extension);
 
                         LoadFileStream();
                     }