diff --git a/extra/nsis/mp-installer.nsi b/extra/nsis/mp-installer.nsi
index 9eff56f..f443b35 100644
--- a/extra/nsis/mp-installer.nsi
+++ b/extra/nsis/mp-installer.nsi
@@ -234,7 +234,7 @@ Function checkFilesInUse
 FunctionEnd
 
 Function LaunchOBS
-	Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk"'
+	Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio.lnk"'
 FunctionEnd
 
 Section "OBS Studio" SecCore
@@ -303,12 +303,13 @@ Section "OBS Studio" SecCore
 	SetOutPath "$INSTDIR\bin\64bit"
 	CreateShortCut "$DESKTOP\OBS Studio.lnk" "$INSTDIR\bin\64bit\obs64.exe"
 
-	CreateDirectory "$SMPROGRAMS\OBS Studio"
-
 	SetOutPath "$INSTDIR\bin\64bit"
-	CreateShortCut "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk" "$INSTDIR\bin\64bit\obs64.exe"
+	CreateShortCut "$SMPROGRAMS\OBS Studio.lnk" "$INSTDIR\bin\64bit\obs64.exe"
 
-	CreateShortCut "$SMPROGRAMS\OBS Studio\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+	; Delete old Start Menu shortcuts if installing upon an older version
+	Delete "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk"
+	Delete "$SMPROGRAMS\OBS Studio\Uninstall.lnk"
+	RMDir "$SMPROGRAMS\OBS Studio"
 SectionEnd
 
 Section -FinishSection
@@ -416,6 +417,7 @@ Section "un.${APPNAME} App Files" UninstallSection1
 	Delete "$SMPROGRAMS\OBS Studio\Uninstall.lnk"
 	${if} ${RunningX64}
 		Delete "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk"
+		Delete "$SMPROGRAMS\OBS Studio.lnk"
 	${endif}
 	SetShellVarContext current