@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using System;
 using System.IO;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
@@ -127,8 +128,8 @@ public static ShellLinkItem GetShellLinkItem(ShellLink linkItem)
 				IsFolder = !string.IsNullOrEmpty(linkItem.TargetPath) && linkItem.Target.IsFolder,
 				RunAsAdmin = linkItem.RunAsAdministrator,
 				Arguments = linkItem.Arguments,
-				WorkingDirectory = linkItem.WorkingDirectory,
-				TargetPath = linkItem.TargetPath
+				WorkingDirectory = Environment.ExpandEnvironmentVariables(linkItem.WorkingDirectory),
+				TargetPath = Environment.ExpandEnvironmentVariables(linkItem.TargetPath)
 			};
 
 			return link;