diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 184952ae..3f42bc43 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -586,7 +586,13 @@
   !endif
 
   !ifdef MUI_FINISHPAGE
-    Page custom mui.Finish "$(MUI_TEXT_FINISH_WINDOWTITLE)"
+    !ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME)
+      Page custom mui.Finish "$(MUI_TEXT_FINISH_WINDOWTITLE)" /ENABLECANCEL
+    !else
+      Page custom mui.Finish "$(MUI_TEXT_FINISH_WINDOWTITLE)"
+    !endif
+  !endif
+      
   !endif
   
   !ifndef MUI_NOVERBOSE
@@ -1145,18 +1151,14 @@
   
     !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_STARTMENU_TITLE) $(MUI_TEXT_STARTMENU_SUBTITLE)
     
-    !ifdef MUI_STARTMENUPAGE_REGISTRY_ROOT
-      !ifdef MUI_STARTMENUPAGE_REGISTRY_KEY
-        !ifdef MUI_STARTMENUPAGE_REGISTRY_VALUENAME
+    !ifdef MUI_STARTMENUPAGE_REGISTRY_ROOT & MUI_STARTMENUPAGE_REGISTRY_KEY & MUI_STARTMENUPAGE_REGISTRY_VALUENAME
         
-          StrCmp "${MUI_STARTMENUPAGE_VARIABLE}" "" "" +4
+      StrCmp "${MUI_STARTMENUPAGE_VARIABLE}" "" "" +4
 
-            ReadRegStr ${MUI_TEMP1} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
-            StrCmp ${MUI_TEMP1} "" +2
-              StrCpy "${MUI_STARTMENUPAGE_VARIABLE}" ${MUI_TEMP1}
+        ReadRegStr ${MUI_TEMP1} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
+        StrCmp ${MUI_TEMP1} "" +2
+        StrCpy "${MUI_STARTMENUPAGE_VARIABLE}" ${MUI_TEMP1}
 
-        !endif
-      !endif
     !endif
 
     !ifndef MUI_STARTMENUPAGE_NODISABLE