diff --git a/Include/Memento.nsh b/Include/Memento.nsh
index e0d01c6f..b86de45c 100644
--- a/Include/Memento.nsh
+++ b/Include/Memento.nsh
@@ -395,7 +395,7 @@ A usage example can be found in `Examples\Memento.nsi`.
     ${If} ${Errors}
 
       # use script defaults on first run
-      Return
+      Goto done
 
     ${EndIf}
 
@@ -436,7 +436,7 @@ A usage example can be found in `Examples\Memento.nsi`.
 
       ${ElseIf} ${Errors}
 
-        Goto done
+        Goto loop_end
 
       ${EndIf}
 
@@ -479,7 +479,7 @@ A usage example can be found in `Examples\Memento.nsi`.
       IntOp $0 $0 + 1
 
     Goto loop
-    done:
+    loop_end:
 
     # restore sections' status
 
@@ -487,6 +487,8 @@ A usage example can be found in `Examples\Memento.nsi`.
 
   # all done
 
+  done:
+
   Pop $3
   Pop $2
   Pop $1