diff --git a/deploy/qgroundcontrol_installer.nsi b/deploy/qgroundcontrol_installer.nsi
index 245442ca3d60a22979338120d2514f1636435333..0d8b3a45e11a868f289486935b76b9bdaab02c1d 100644
--- a/deploy/qgroundcontrol_installer.nsi
+++ b/deploy/qgroundcontrol_installer.nsi
@@ -20,10 +20,8 @@ SectionEnd
 
 Section "Uninstall"
   Delete $INSTDIR\QGroundControl_uninstall.exe
-  Delete $INSTDIR\*.*
-  RMDir $INSTDIR
-  Delete "$SMPROGRAMS\QGroundControl\*.*"
-  RMDir "$SMPROGRAMS\QGroundControl\"
+  RMDir /r /REBOOTOK $INSTDIR
+  RMDir /r /REBOOTOK "$SMPROGRAMS\QGroundControl\"
 SectionEnd
 
 Section "create Start Menu Shortcuts"