diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 290f017b6c..a7756e44b7 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1297,6 +1297,10 @@ class Util
             $pages = array_unique($pages);
         }
 
+        if ($pageNow > $nbTotalPage) {
+            $pages[] = $pageNow;
+        }
+
         foreach ($pages as $i) {
             if ($i == $pageNow) {
                 $selected = 'selected="selected" style="font-weight: bold"';
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index a04c9db6e5..399d145fd7 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -372,6 +372,12 @@ class UtilTest extends AbstractTestCase
             '<select class="pageselector ajax" name="pma" >',
             Util::pageselector('pma', 3)
         );
+
+        // If pageNow > nbTotalPage, show the pageNow number to avoid confusion
+        $this->assertStringContainsString(
+            '<option selected="selected" style="font-weight: bold" value="297">100</option>',
+            Util::pageselector('pma', 3, 100, 50)
+        );
     }
 
     /**