diff --git a/packaging/windows/installer.nsh b/packaging/windows/installer.nsh
index e3b6fa3..6756d0b 100644
--- a/packaging/windows/installer.nsh
+++ b/packaging/windows/installer.nsh
@@ -42,40 +42,17 @@
   done_uninstall:
 !macroend
 
-!macro fixShortcutWorkingDir SHORTCUT_PATH WORKING_DIR
-  Push $0
-  Push $1
-  Push $2
-  StrCpy $1 "${SHORTCUT_PATH}"
-  StrCpy $2 "${WORKING_DIR}"
-  InitPluginsDir
-  FileOpen $0 "$PLUGINSDIR\fix-shortcut.ps1" w
-  FileWrite $0 '$$s = (New-Object -COM WScript.Shell).CreateShortcut("'
-  FileWrite $0 $1
-  FileWrite $0 '")$\r$\n'
-  FileWrite $0 '$$s.WorkingDirectory = "'
-  FileWrite $0 $2
-  FileWrite $0 '"$\r$\n'
-  FileWrite $0 '$$s.Save()$\r$\n'
-  FileClose $0
-  ExecWait '"$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -ExecutionPolicy Bypass -File "$PLUGINSDIR\fix-shortcut.ps1"'
-  Delete "$PLUGINSDIR\fix-shortcut.ps1"
-  Pop $2
-  Pop $1
-  Pop $0
-!macroend
-
 !macro createDesktopShortcut
   SetShellVarContext current
+  SetOutPath "$INSTDIR\bin"
   CreateShortCut "$DESKTOP\Farm Control.lnk" "$INSTDIR\bin\launcher.exe" "" "$INSTDIR\bin\launcher.exe" 0 SW_SHOWNORMAL "" "Farm Control"
-  !insertmacro fixShortcutWorkingDir "$DESKTOP\Farm Control.lnk" "$INSTDIR\bin"
 !macroend
 
 !macro createStartMenuShortcut
   SetShellVarContext current
   CreateDirectory "$SMPROGRAMS\Farm Control"
+  SetOutPath "$INSTDIR\bin"
   CreateShortCut "$SMPROGRAMS\Farm Control\Farm Control.lnk" "$INSTDIR\bin\launcher.exe" "" "$INSTDIR\bin\launcher.exe" 0 SW_SHOWNORMAL "" "Farm Control"
-  !insertmacro fixShortcutWorkingDir "$SMPROGRAMS\Farm Control\Farm Control.lnk" "$INSTDIR\bin"
 !macroend
 
 !macro removeDesktopShortcut