diff --git a/ChangeLog b/ChangeLog
index c9edaad11..7c9f906ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1783620 [parser] Subquery results without "as" are ignored 
 - bug #1821264 [display] MaxTableList and INFORMATION_SCHEMA 
 - bug #1859460 [display] Operations and many databases
+- bug #1814679 [display] Database selection pagination when switching servers
 
 2.11.3.0 (2007-12-08)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index cfa66e53a..81a31ef85 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -898,6 +898,14 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         require_once './libraries/List_Database.class.php';
         $PMA_List_Database = new PMA_List_Database($userlink, $controllink);
 
+        /**
+         * some resetting has to be done when switching servers
+         */
+        if (isset($_SESSION['previous_server']) && $_SESSION['previous_server'] != $GLOBALS['server']) {
+            unset($_SESSION ['navi_limit_offset']);
+        }
+        $_SESSION['previous_server'] = $GLOBALS['server'];
+
     } // end server connecting
 
     /**