diff --git a/deploy/qgroundcontrol_installer.nsi b/deploy/qgroundcontrol_installer.nsi
index 7bc1fee835b64354b63f8be061228e59ebe1ec53..4ead2289ab9ab896a38e83aa3b971685cbb02a68 100644
--- a/deploy/qgroundcontrol_installer.nsi
+++ b/deploy/qgroundcontrol_installer.nsi
@@ -26,6 +26,8 @@ Section "Uninstall"
   Delete $INSTDIR\QGroundControl_uninstall.exe
   RMDir /r /REBOOTOK $INSTDIR
   RMDir /r /REBOOTOK "$SMPROGRAMS\QGroundControl\"
+  SetShellVarContext current
+  RMDir /r /REBOOTOK "$APPDATA\QGROUNDCONTROL.ORG\"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\QGroundControl"
 SectionEnd
 
@@ -43,4 +45,4 @@ Function .onInit
   	"QGroundControl is already installed. $\n$\nYou must uninstall the previous version before installing a new one."
   Abort
 done: 
-FunctionEnd
\ No newline at end of file
+FunctionEnd