diff --git a/NasaPod/Forms/FormSettings.cs b/NasaPod/Forms/FormSettings.cs
index afa26b5..6fa9904 100644
--- a/NasaPod/Forms/FormSettings.cs
+++ b/NasaPod/Forms/FormSettings.cs
@@ -81,6 +81,7 @@ private void ManageAutostart(bool autostart)
                         IWshRuntimeLibrary.WshShell shell = new IWshRuntimeLibrary.WshShell();
                         IWshRuntimeLibrary.IWshShortcut shortcut = (IWshRuntimeLibrary.IWshShortcut)shell.CreateShortcut(Path.Combine(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup)), "Nasa.lnk"));
                         shortcut.TargetPath = Application.ExecutablePath;
+                        shortcut.WorkingDirectory = Path.GetDirectoryName(Application.ExecutablePath);
                         shortcut.Save();
                     }
                 }
diff --git a/NasaPod/Nasa.csproj b/NasaPod/Nasa.csproj
index 7c43656..d745f0f 100644
--- a/NasaPod/Nasa.csproj
+++ b/NasaPod/Nasa.csproj
@@ -20,8 +20,8 @@
 	<SignAssembly>False</SignAssembly>
 	<PackageProjectUrl>https://github.com/Nerdomante/NasaAPOD</PackageProjectUrl>
 	<RepositoryUrl>https://github.com/Nerdomante/NasaAPOD</RepositoryUrl>
-	<AssemblyVersion>1.2.4</AssemblyVersion>
-	<FileVersion>1.2.4</FileVersion>
+	<AssemblyVersion>1.2.5</AssemblyVersion>
+	<FileVersion>1.2.5</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>