diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi
index 63776df8..62f9166a 100644
--- a/Examples/Modern UI/InstallOptions.nsi	
+++ b/Examples/Modern UI/InstallOptions.nsi	
@@ -129,18 +129,7 @@ Function SetPage
     !insertmacro MUI_PAGE_START 2
 
        !insertmacro MUI_HEADER_TEXT 1033 "Install Options A" "Create your own dialog!"
-
-        InstallOptions::dialog "$PLUGINSDIR\iniA.ini"
-        Pop ${TEMP1}
-
-        StrCmp ${TEMP1} "cancel" "" +2
-          Quit
-
-        StrCmp ${TEMP1} "back" "" ioA_noback
-          !insertmacro MUI_INSTALLOPTIONS_BACK
-          ioA_noback:
-
-        !insertmacro MUI_INSTALLOPTIONS_NEXT
+       !insertmacro MUI_INSTALLOPTIONS_SHOW "iniA.ini"
 
     !insertmacro MUI_PAGE_STOP 2
 
@@ -155,18 +144,7 @@ Function SetPage
     !insertmacro MUI_PAGE_START 5
 
        !insertmacro MUI_HEADER_TEXT 1033 "Install Options B" "Create your own dialog!"
-
-        InstallOptions::dialog "$PLUGINSDIR\iniB.ini"
-        Pop ${TEMP1}
-
-        StrCmp ${TEMP1} "cancel" "" +2
-          Quit
-
-        StrCmp ${TEMP1} "back" "" ioB_noback
-          !insertmacro MUI_INSTALLOPTIONS_BACK
-          ioB_noback:
-
-        !insertmacro MUI_INSTALLOPTIONS_NEXT
+       !insertmacro MUI_INSTALLOPTIONS_SHOW "iniB.ini"
 
     !insertmacro MUI_PAGE_STOP 5
 
diff --git a/Examples/Modern UI/ModernUI.nsh b/Examples/Modern UI/ModernUI.nsh
index a7cb7700..c9b34d91 100644
--- a/Examples/Modern UI/ModernUI.nsh	
+++ b/Examples/Modern UI/ModernUI.nsh	
@@ -1,4 +1,4 @@
-;Modern UI Header File version 1.19d - WORKING ON INSTALLOPTIONS INTEGRATION
+;Modern UI Header File version 1.19e - WORKING ON INSTALLOPTIONS INTEGRATION
 ;Written by Joost Verburg
 
 ;See Example.nsi & Multilanguage.nsi for an example of usage
@@ -222,6 +222,21 @@
 
 !macroend
 
+!macro MUI_INSTALLOPTIONS_SHOW FILE
+        
+  InstallOptions::dialog "$PLUGINSDIR\${FILE}"
+  Pop ${TEMP1}
+
+  StrCmp ${TEMP1} "cancel" "" +2
+    Quit
+
+  StrCmp ${TEMP1} "back" "" +7
+    !insertmacro MUI_INSTALLOPTIONS_BACK
+
+  !insertmacro MUI_INSTALLOPTIONS_NEXT
+		
+!macroend
+
 !macro MUI_INSTALLOPTIONS_BACK
 
   StrCmp ${IO_DIRECTION} "${IO_DIRECTION_NEXT}" "" +3