diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
index a47d4ae3..7d48ccf2 100644
--- a/program_info/win_install.nsi
+++ b/program_info/win_install.nsi
@@ -141,7 +141,7 @@ Section "PolyMC"
 
 SectionEnd
 
-Section "Start Menu Shortcuts"
+Section "Start Menu Shortcuts" SHORTCUTS
 
   CreateShortcut "$SMPROGRAMS\PolyMC.lnk" "$INSTDIR\polymc.exe" "" "$INSTDIR\polymc.exe" 0
 
@@ -219,3 +219,15 @@ Section "Uninstall"
   RMDir "$INSTDIR"
 
 SectionEnd
+
+;--------------------------------
+
+; Extra command line parameters
+
+Function .onInit
+${GetParameters} $R0
+${GetOptions} $R0 "/NoShortcuts" $R1
+${IfNot} ${Errors}
+  !insertmacro UnselectSection ${SHORTCUTS}
+${EndIf}
+FunctionEnd