From 51f830bdf6746563a61b31d048df5f9d6e2bfdea Mon Sep 17 00:00:00 2001
From: slprime <31038811+slprime@users.noreply.github.com>
Date: Mon, 9 Feb 2026 23:18:22 +0200
Subject: [PATCH] Reset item panel page on search result size change (#855)

Co-authored-by: UltraProdigy <187078471+UltraProdigy@users.noreply.github.com>
---
 src/main/java/codechicken/nei/ItemPanel.java      | 8 +++++++-
 src/main/java/codechicken/nei/ItemsPanelGrid.java | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java
index 0d742c07..85fa3275 100644
--- a/src/main/java/codechicken/nei/ItemPanel.java
+++ b/src/main/java/codechicken/nei/ItemPanel.java
@@ -75,7 +75,13 @@ public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
     }
 
     public static void updateItemList(ArrayList<ItemStack> newItems) {
-        ItemPanels.itemPanel.getGrid().setItems(newItems);
+        final ItemsPanelGrid grid = ItemPanels.itemPanel.getGrid();
+
+        if (grid.rawItems.size() != newItems.size()) {
+            grid.setPage(0);
+        }
+
+        grid.setItems(newItems);
         ItemPanels.itemPanel.realItems = newItems;
     }
 
diff --git a/src/main/java/codechicken/nei/ItemsPanelGrid.java b/src/main/java/codechicken/nei/ItemsPanelGrid.java
index f944aa2e..dbc22ea2 100644
--- a/src/main/java/codechicken/nei/ItemsPanelGrid.java
+++ b/src/main/java/codechicken/nei/ItemsPanelGrid.java
@@ -70,7 +70,7 @@ public class ItemsPanelGrid extends ItemsGrid<ItemsPanelGrid.ItemsPanelGridSlot,
     }
 
     public ArrayList<ItemStack> newItems;
-    public ArrayList<ItemStack> rawItems;
+    public ArrayList<ItemStack> rawItems = new ArrayList<>();
     protected List<ItemsPanelGridSlot> gridMask;
 
     protected final Map<Integer, Integer> itemToGroup = new HashMap<>();