diff --git a/libraries/Menu.php b/libraries/Menu.php
index c9a02fe0ba..ae2f0c9e85 100644
--- a/libraries/Menu.php
+++ b/libraries/Menu.php
@@ -95,14 +95,16 @@ class Menu
      */
     private function _getMenu()
     {
-        $url_params = array('db' => $this->_db);
+        $url_params = array();
 
         if (strlen($this->_table) > 0) {
             $tabs = $this->_getTableTabs();
+            $url_params['db'] = $this->_db;
             $url_params['table'] = $this->_table;
             $level = 'table';
         } else if (strlen($this->_db) > 0) {
             $tabs = $this->_getDbTabs();
+            $url_params['db'] = $this->_db;
             $level = 'db';
         } else {
             $tabs = $this->_getServerTabs();
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index 1206ad7b9c..717b0e631a 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -24,7 +24,7 @@ if (empty($viewing_mode)) {
 /**
  * Set parameters for links
  */
-$GLOBALS['url_query'] = URL::getCommon(array('db' => $db));
+$GLOBALS['url_query'] = URL::getCommon();
 
 /**
  * Defines the urls to return to in case of error in a sql statement