diff --git a/ChangeLog b/ChangeLog
index fc739cd1e0..cafb4ef375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@ phpMyAdmin - ChangeLog
 - issue #13033 Use Referrer-Policy header to specify referrer policy
 - issue        Fixed javascript confirmation of dangerous queries
 - issue #13040 Compatibility with hhvm 3.18
+- issue #13031 Fixed displaying of all rows
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
index 18035cd950..d9e4c6826b 100644
--- a/libraries/DisplayResults.php
+++ b/libraries/DisplayResults.php
@@ -867,13 +867,10 @@ class DisplayResults
         }
 
         // Move to the next page or to the last one
-        $endpos = $_SESSION['tmpval']['pos']
-            + $_SESSION['tmpval']['max_rows'];
-
         if ($this->__get('unlim_num_rows') === false // view with unknown number of rows
-            || ($endpos < $this->__get('unlim_num_rows')
-            && $this->__get('num_rows') >= $_SESSION['tmpval']['max_rows']
-            && $_SESSION['tmpval']['max_rows'] != self::ALL_ROWS)
+            || ($_SESSION['tmpval']['max_rows'] != self::ALL_ROWS
+            && $_SESSION['tmpval']['pos'] + $_SESSION['tmpval']['max_rows'] < $this->__get('unlim_num_rows')
+            && $this->__get('num_rows') >= $_SESSION['tmpval']['max_rows'])
         ) {
 
             $table_navigation_html