diff --git a/build/win/installer.nsh b/build/win/installer.nsh
index a5f372bec7dc..09a3ec834c96 100644
--- a/build/win/installer.nsh
+++ b/build/win/installer.nsh
@@ -1,4 +1,19 @@
+!ifndef BUILD_UNINSTALLER
+  Function AddToStartup
+    CreateShortCut "$SMSTARTUP\Rocket.Chat+.lnk" "$INSTDIR\Rocket.Chat+.exe" ""
+  FunctionEnd
+
+  ; Using the read me setting as an easy way to add an add to startup option
+  !define MUI_FINISHPAGE_SHOWREADME
+  !define MUI_FINISHPAGE_SHOWREADME_TEXT "Run at startup"
+  !define MUI_FINISHPAGE_SHOWREADME_FUNCTION AddToStartup
+!endif
+
 !macro customInstall
     ; Required as electron-builder does not provide a way to specify it as of version 11.2.4
     WriteRegStr SHCTX "${UNINSTALL_REGISTRY_KEY}" "DisplayIcon" '"$INSTDIR\resources\build\icon.ico"'
 !macroend
+
+!macro customUnInstall
+  Delete "$SMSTARTUP\Rocket.Chat+.lnk"
+!macroend