diff --git a/package/nsis/main.nsi b/package/nsis/main.nsi
index 0fad6cbf..b958bdd9 100755
--- a/package/nsis/main.nsi
+++ b/package/nsis/main.nsi
@@ -2,6 +2,11 @@
 !include package\nsis\includes.nsh
 !include package\nsis\check-running.nsh
 
+!define MUI_FINISHPAGE_SHOWREADME ""
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create a Shortcut on Desktop"
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION FinishPageCheckboxCheckedAction
+
 !insertmacro MUI_PAGE_WELCOME
 #!insertmacro MULTIUSER_PAGE_INSTALLMODE
 !insertmacro MUI_PAGE_DIRECTORY
@@ -50,6 +55,10 @@ Function .onInit
   !insertmacro MULTIUSER_INIT
 FunctionEnd
 
+Function FinishPageCheckboxCheckedAction
+  CreateShortCut "$DESKTOP\KeeWeb.lnk" "$INSTDIR\${PRODUCT_EXE}"
+FunctionEnd
+
 Section "MainSection" SEC01
   !insertmacro EnsureAppIsNotRunning
 
@@ -78,7 +87,6 @@ Section "MainSection" SEC01
   RMDir /r "$INSTDIR\resources\app"
   CreateDirectory "$SMPROGRAMS\KeeWeb"
   CreateShortCut "$SMPROGRAMS\KeeWeb\KeeWeb.lnk" "$INSTDIR\${PRODUCT_EXE}"
-  CreateShortCut "$DESKTOP\KeeWeb.lnk" "$INSTDIR\${PRODUCT_EXE}"
 
   !insertmacro APP_ASSOCIATE "kdbx" "kdbxfile" "KeePass Password Database" \
     "$INSTDIR\${PRODUCT_EXE},0" "Open with KeeWeb" "$INSTDIR\${PRODUCT_EXE} $\"%1$\""
diff --git a/release-notes.md b/release-notes.md
index 5bce74cd..dd58d932 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -15,6 +15,7 @@ Release notes
 `+` #1350: clearing master password after auto lock period  
 `+` #830: minimize instead of close option on macOS  
 `+` #448: minimized login option support on macOS  
+`+` #917: option to install without a desktop icon on Windows  
 `-` fix #1463: copying the original url instead of adding https:  
 `-` fix #620: clearing middle-click clipboard in Linux  
 `-` fix #1440: fixed auto-type for maximized windows