diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/pagination/AdvancedPagination.java b/domino-ui/src/main/java/org/dominokit/domino/ui/pagination/AdvancedPagination.java index 581dfd411..cc657eb18 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/pagination/AdvancedPagination.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/pagination/AdvancedPagination.java @@ -15,6 +15,7 @@ */ package org.dominokit.domino.ui.pagination; +import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static org.dominokit.domino.ui.utils.Domino.*; @@ -133,7 +134,9 @@ public AdvancedPagination(int pages, int pageSize) { pagesSelect = Select.create() .addChangeListener( - (oldValue, newValue) -> moveToPage(newValue, isChangeListenersPaused())); + (oldValue, newValue) -> { + moveToPage(isNull(newValue) ? 1 : newValue, isChangeListenersPaused()); + }); pagesList.insertAfter( PagerNavItem.create(pagesSelect)