diff --git a/installer/picard-setup.nsi.in b/installer/picard-setup.nsi.in
index 3b75e2b60..fe3b93a18 100644
--- a/installer/picard-setup.nsi.in
+++ b/installer/picard-setup.nsi.in
@@ -140,18 +140,21 @@ SubSection "Shortcuts" shortcuts
   
   Section "Startmenu" startmenu
     SetShellVarContext all
+    SetOutPath "$INSTDIR"
     CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}.lnk" "$INSTDIR\picard.exe" \
       "" "" "" SW_SHOWNORMAL "" "${PRODUCT_DESCRIPTION}"
   SectionEnd
   
   Section "Desktop" desktop
     SetShellVarContext all
+    SetOutPath "$INSTDIR"
     CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\picard.exe" \
       "" "" "" SW_SHOWNORMAL "" "${PRODUCT_DESCRIPTION}"
   SectionEnd
   
   Section "Quick Launch" quicklaunch
     SetShellVarContext all
+    SetOutPath "$INSTDIR"
     CreateShortCut "$QUICKLAUNCH\${PRODUCT_NAME}.lnk" "$INSTDIR\picard.exe" \
       "" "" "" SW_SHOWNORMAL "" "${PRODUCT_DESCRIPTION}"
   SectionEnd