diff --git a/ChangeLog b/ChangeLog
index aa42dce5bce9..459037404fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
 3.1.1.0 (not yet released)
+- patch #2242765 [core] Navi panel server links wrong,
+  thanks to Martin Stricker - martinstricker
 
 3.1.0.0 (not yet released)
 + [auth] Support for Swekey hardware authentication
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 8521c6d6aee6..78c03dc490af 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -240,7 +240,9 @@ function PMA_generate_common_url()
     $separator = PMA_get_arg_separator();
 
     if (isset($GLOBALS['server'])
-      && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']) {
+        && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
+            // avoid overwriting when creating navi panel links to servers
+        && ! isset($params['server'])) {
         $params['server'] = $GLOBALS['server'];
     }