diff --git a/build/installer.nsh b/build/installer.nsh
new file mode 100644
index 0000000000..8ff35b5e4f
--- /dev/null
+++ b/build/installer.nsh
@@ -0,0 +1,12 @@
+!macro customInit
+  ; Workaround for installer handing when the app directory is removed manually
+  ${ifNot} ${FileExists} "$INSTDIR"
+    DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\{${UNINSTALL_APP_KEY}}"
+  ${EndIf}
+
+  ; Workaround for the old-format uninstall registry key (some people report it causes hangups, too)
+  ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_APP_KEY}" "QuietUninstallString"
+  StrCmp $0 "" proceed 0
+  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_APP_KEY}"
+  proceed:
+!macroend
\ No newline at end of file
diff --git a/package.json b/package.json
index fc793860a4..a87ced4460 100644
--- a/package.json
+++ b/package.json
@@ -143,6 +143,9 @@
         }
       ]
     },
+    "nsis": {
+      "include": "build/installer.nsh"
+    },
     "publish": [
       {
         "provider": "github",