From 4a9b904b775159eb5308613d4eff35bb16845716 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Thu, 6 Feb 2025 08:48:36 -0500
Subject: [PATCH] Fix issue processwire/processwire-issues#2030

---
 .../Fieldtype/FieldtypeRepeater/RepeaterPageArray.php        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPageArray.php b/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPageArray.php
index 1733109c..703145c2 100644
--- a/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPageArray.php
+++ b/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPageArray.php
@@ -175,16 +175,17 @@ class RepeaterPageArray extends PageArray {
 
 		if(is_null($page)) { 
 			// no ready item available, get a new one
-			$page = $fieldtype->getBlankRepeaterPage($this->forPage, $this->field); 
+			$page = $fieldtype->getBlankRepeaterPage($this->forPage, $this->field);
+			$page->sort = $this->count();
 			$this->add($page);
 		} else {
+			$page->sort = $this->count();
 			$this->trackChange('add');
 		}
 
 		$page->of(false);
 		$page->removeStatus(Page::statusUnpublished); 
 		$page->removeStatus(Page::statusHidden); 
-		$page->sort = $this->count();
 
 		if($of) $this->forPage->of(true);