diff --git a/.appveyor.yml b/.appveyor.yml
index 01990b05da5cad3ceb57a09ae399012de8bc0216..115d3e82bc5c967bf6d54b781f975da65aa8a20c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,7 +17,7 @@ install:
   - call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
   - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.5\msvc2013\bin;%PATH%
   - mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\
-  - if "%CONFIG%" EQU "installer" ( cinst nsis.install -y -installArgs /D="%programfiles(x86)%\NSIS" )
+  - if "%CONFIG%" EQU "installer" ( cinst nsis.install -pre -y -installArgs /D="%programfiles(x86)%\NSIS" )
 
 build_script:
   - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
diff --git a/deploy/qgroundcontrol_installer.nsi b/deploy/qgroundcontrol_installer.nsi
index 1b1f1fcde08bf611179a8e8b96e28b48111a0d34..3f9014a480e52c7f2b1d4766ec558a1c985acb70 100644
--- a/deploy/qgroundcontrol_installer.nsi
+++ b/deploy/qgroundcontrol_installer.nsi
@@ -1,4 +1,40 @@
 !include "MUI2.nsh"
+!include LogicLib.nsh
+!include Win\COM.nsh
+!include Win\Propkey.nsh
+
+!macro DemoteShortCut target
+    !insertmacro ComHlpr_CreateInProcInstance ${CLSID_ShellLink} ${IID_IShellLink} r0 ""
+    ${If} $0 <> 0
+            ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
+            ${If} $1 P<> 0
+                    ${IPersistFile::Load} $1 '("${target}",1)'
+                    ${IUnknown::Release} $1 ""
+            ${EndIf}
+            ${IUnknown::QueryInterface} $0 '("${IID_IPropertyStore}",.r1)'
+            ${If} $1 P<> 0
+                    System::Call '*${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_StartPinOption})p.r2'
+                    System::Call '*${SYSSTRUCT_PROPVARIANT}(${VT_UI4},,&i4 ${APPUSERMODEL_STARTPINOPTION_NOPINONINSTALL})p.r3'
+                    ${IPropertyStore::SetValue} $1 '($2,$3)'
+
+                    ; Reuse the PROPERTYKEY & PROPVARIANT buffers to set another property
+                    System::Call '*$2${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_ExcludeFromShowInNewInstall})'
+                    System::Call '*$3${SYSSTRUCT_PROPVARIANT}(${VT_BOOL},,&i2 ${VARIANT_TRUE})'
+                    ${IPropertyStore::SetValue} $1 '($2,$3)'
+
+                    System::Free $2
+                    System::Free $3
+                    ${IPropertyStore::Commit} $1 ""
+                    ${IUnknown::Release} $1 ""
+            ${EndIf}
+            ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
+            ${If} $1 P<> 0
+                    ${IPersistFile::Save} $1 '("${target}",1)'
+                    ${IUnknown::Release} $1 ""
+            ${EndIf}
+            ${IUnknown::Release} $0 ""
+    ${EndIf}
+!macroend
 
 Name "QGroundcontrol"
 Var StartMenuFolder
@@ -71,7 +107,9 @@ Section "create Start Menu Shortcuts"
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl.lnk" "$INSTDIR\qgroundcontrol.exe" "" "$INSTDIR\qgroundcontrol.exe" 0
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Compatibility Mode).lnk" "$INSTDIR\qgroundcontrol.exe" "-angle" "$INSTDIR\qgroundcontrol.exe" 0
+  !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Compatibility Mode).lnk"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Safe Mode).lnk" "$INSTDIR\qgroundcontrol.exe" "-swrast" "$INSTDIR\qgroundcontrol.exe" 0
+  !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Safe Mode).lnk"
 SectionEnd
 
 Function .onInit