1 files changed, 4 insertions, 0 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
index 52d0cc172..ab0a4158e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
@@ -378,6 +378,10 @@ public final class Widgets {
             protected T computeNext() {
                 while (!stack.empty()) {
                     Iterator<? extends GuiEventListener> peek = stack.peek();
+                    if (!peek.hasNext())
+                        stack.pop();
+                    if (stack.isEmpty())
+                        break;
                     GuiEventListener listener = peek.next();
                     if (!peek.hasNext())
                         stack.pop();