diff --git a/gravity-forms/gwaft-template-collapsible.php b/gravity-forms/gwaft-template-collapsible.php
index 0f14e243e..6097a031c 100644
--- a/gravity-forms/gwaft-template-collapsible.php
+++ b/gravity-forms/gwaft-template-collapsible.php
@@ -25,7 +25,14 @@
 	$pages = $data['form']['pagination']['pages'];
 	$page_groups = array();
 	foreach ( $data['items'] as $item ) {
-		$page_groups[ $item['field']['pageNumber'] ][] = $item;
+		$field = $item['field'];
+		// Skip hidden fields.
+		if ( $field->type === 'hidden' || $field->visibility === 'hidden' ) {
+			continue;
+		}
+		// Adjust pageNumber to be zero-based.
+		$page_index = $field->pageNumber - 1;
+		$page_groups[ $page_index ][] = $item;
 	}
 	ob_start();
 	?>