diff --git a/win32/deluge.nsi b/win32/deluge.nsi
index 290550361..b5ab3aa02 100644
--- a/win32/deluge.nsi
+++ b/win32/deluge.nsi
@@ -142,6 +142,8 @@ SubSection /e "Core" core
 
         ${install_MSI} DELUGE_INSTALLER "$INSTDIR\Deluge"
 
+		SetOutPath "$INSTDIR\Deluge"
+		
         WriteUninstaller "$INSTDIR\Deluge\uninstall.exe"
 
     SectionEnd
@@ -227,6 +229,7 @@ SubSectionEnd
 Section "Uninstall"
 
     Delete "$INSTDIR\Deluge\uninstall.exe"
+	RMDir "$INSTDIR\Deluge"
     RMDir "$INSTDIR"
 
 SectionEnd