diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 944550f5..31d06fd7 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -490,6 +490,7 @@ Section "Uninstall"
 	Delete /REBOOTOK "$INSTDIR\LameXP.exe"
 	Delete /REBOOTOK "$INSTDIR\LameXP-Portable.exe"
 	Delete /REBOOTOK "$INSTDIR\LameXP.exe.sig"
+	Delete /REBOOTOK "$INSTDIR\LameXP*"
 	Delete /REBOOTOK "$INSTDIR\Uninstall.exe"
 	Delete /REBOOTOK "$INSTDIR\Changelog.htm"
 	Delete /REBOOTOK "$INSTDIR\Changelog.html"
diff --git a/etc/NSIS/wrapper.nsi b/etc/NSIS/wrapper.nsi
index 8008dca1..1e5f4a83 100644
--- a/etc/NSIS/wrapper.nsi
+++ b/etc/NSIS/wrapper.nsi
@@ -171,7 +171,7 @@ Section "-LaunchTheInstaller"
 
 	RunFailed:
 
-	MessageBox MB_RETRYCANCEL|MB_DEFBUTTON2|MB_ICONSTOP|MB_TOPMOST "Failed to launch the installer. Please try again!" IDRETRY RunTryAgain
+	MessageBox MB_RETRYCANCEL|MB_ICONSTOP|MB_TOPMOST "Failed to launch the installer. Please try again!" IDRETRY RunTryAgain
 
 	; --------