diff --git a/nsis/SectionUninstaller.nsh b/nsis/SectionUninstaller.nsh
index 35839a8c8b..e1f33cd050 100644
--- a/nsis/SectionUninstaller.nsh
+++ b/nsis/SectionUninstaller.nsh
@@ -11,6 +11,7 @@ Section "Un.Exes and Plugins ${APP_NAME}"
 
   !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR"
 
+  ; nsis todo: Some legacy key? Check
   ; Remove registry keys (but only the ones related to the installer -- user options remain)
   DeleteRegKey HKLM "${INSTDIR_REG_KEY}"
 
@@ -23,14 +24,20 @@ Section "Un.Exes and Plugins ${APP_NAME}"
 
 SectionEnd
 
-Section "Un.Complete Registry Cleanup"
+Section "Un.Complete Settings / Registry Cleanup"
 
+  ; nsis todo: Some legacy key? Check
   ; Kill the entire PCSX2 registry key!
   DeleteRegKey ${INSTDIR_REG_ROOT} Software\PCSX2
 
-  ; Kill AppData/PCSX2 entry!
-
+  ; Kill user options PCSX2 reg key
+  DeleteRegKey HKCU Software\PCSX2
+  
   SetShellVarContext current
+  RMDir /r "$DOCUMENTS\PCSX2\inis\"
+
+  ; nsis todo: is this still used?
+  ; Kill AppData/PCSX2 entry!
   StrCpy $0 $LOCALAPPDATA\PCSX2
   Call un.DeleteDirIfEmpty
   StrCpy $0 $APPDATA\PCSX2