Index: src/main/java/info/magnolia/cms/taglibs/PageIterator.java
===================================================================
--- src/main/java/info/magnolia/cms/taglibs/PageIterator.java	(revision 4307)
+++ src/main/java/info/magnolia/cms/taglibs/PageIterator.java	(working copy)
@@ -57,6 +57,8 @@
     private Iterator contentIterator;
 
     private String hiddenAttribute = "hidden";
+    
+    private Content prevContent;
 
     public int doAfterBody() throws JspException {
         boolean hasNext = nextContent();
@@ -69,11 +71,12 @@
     }
 
     public int doEndTag() throws JspException {
-        Resource.restoreCurrentActivePage();
+        Resource.setCurrentActivePage(this.prevContent);
         return EVAL_PAGE;
     }
 
     public int doStartTag() throws JspException {
+        this.prevContent = Resource.getCurrentActivePage();
         initContentIterator();
 
         boolean hasNext = nextContent();