diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 6e1a38c4b..2f6d8045a 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -174,8 +174,19 @@ updaterDone:
 	InitPluginsDir			; Initializes the plug-ins dir ($PLUGINSDIR) if not already initialized.
 	Call preventInstallInWin9x
 		
+	; look for previously selected language
+	ClearErrors
+	Var /GLOBAL tempLng
+	ReadRegStr $tempLng HKLM "SOFTWARE\${APPNAME}" 'InstallerLanguage'
+	${IfNot} ${Errors}
+		StrCpy $Language "$tempLng" ; set default language
+	${EndIf}
+	
 	!insertmacro MUI_LANGDLL_DISPLAY
 
+	; save selected language to registry
+	WriteRegStr HKLM "SOFTWARE\${APPNAME}" 'InstallerLanguage' '$Language'
+
 !ifdef ARCH64 || ARCHARM64 ; x64 or ARM64
 	${If} ${RunningX64}
 		; disable registry redirection (enable access to 64-bit portion of registry)