diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index 7551d10d..fe419cc7 100644
--- a/Contrib/Modern UI/Readme.html	
+++ b/Contrib/Modern UI/Readme.html	
@@ -260,11 +260,13 @@ add the following things (in order, from the beginning of the script):</p>
   <p class="subheader">6. Insert the MUI_SYSTEM macro</p>
   <pre class="margin">!insertmacro MUI_SYSTEM</pre>
   <p class="subheader">7. Insert the MUI_SECTIONS_FINISHHEADER macro
-  <p class="text">If you are not using a Finish page, you should insert the
-  MUI_SECTIONS_FINISHHEADER after all the sections to display the finish-header.</p>
+  <p class="text">If you are not using a Finish page without defining
+  MUI_FINISHPAGE_NOAUTOCLOSEWINDOW and have not set AutoCloseWindow
+  to true, you should insert the MUI_SECTIONS_FINISHHEADER
+  after all the sections to display the finish-header:</p>
 <pre class="margin">!insertmacro MUI_SECTIONS_FINISHHEADER</pre>
 <p class="text">For the uninstaller, insert MUI_UNFINISHHEADER at the end of the
-Unintaller section.</p>
+Unintaller section:</p>
 <pre class="margin">
 !insertmacro MUI_UNFINISHHEADER
 </pre>
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index f4b2ae12..b35db324 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -1532,6 +1532,14 @@
 
 !macro MUI_LANGUAGEFILE_END
 
+  !ifdef MUI_FINISHPAGE
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE"
+  !endif
+  
+  !ifdef MUI_STARTMENUPAGE
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_WINDOWTITLE"
+  !endif
+
   !ifndef MUI_LANGUAGEFILE_INSERTED
   
     !define MUI_LANGUAGEFILE_INSERTED
@@ -1576,7 +1584,6 @@
   !endif
   
   !ifdef MUI_STARTMENUPAGE
-    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_WINDOWTITLE"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_TITLE"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_SUBTITLE"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_INNERTEXT_STARTMENU_TOP" "MUI_INSTALLBUTTON_STARTMENU"
@@ -1594,7 +1601,6 @@
   !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE"
   
   !ifdef MUI_FINISHPAGE
-    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE"
     !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" "" "${MUI_TEXT_FINISH_BUTTON}"'
     !ifndef MUI_TEXT_FINISH_INFO_TITLE
       LangString "MUI_TEXT_FINISH_INFO_TITLE" 0 "${MUI_TEXT_FINISH_TITLE}"