diff --git a/libraries/tbl_properties_links.inc.php b/libraries/tbl_properties_links.inc.php
index dd31ea383..20e078ab3 100644
--- a/libraries/tbl_properties_links.inc.php
+++ b/libraries/tbl_properties_links.inc.php
@@ -18,10 +18,12 @@ require_once('./libraries/bookmark.lib.php');
  * Set parameters for links
  */
 $url_query = PMA_generate_common_url($db, $table);
-$url_params = array(
-    'db' => $db,
-    'table' => $table,
-);
+
+if ( ! isset( $url_params ) ) {
+    $url_params = array();
+}
+$url_params['db']    = $db;
+$url_params['table'] = $table;
 
 /**
  * Defines the urls to return to in case of error in a sql statement
diff --git a/tbl_properties_common.php b/tbl_properties_common.php
index bad3f00a4..19af193cf 100644
--- a/tbl_properties_common.php
+++ b/tbl_properties_common.php
@@ -18,6 +18,8 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 && $db === 'information_schema' ) {
     $db_is_information_schema = false;
 }
 
+$url_query = PMA_generate_common_url($db, $table);
+
 /**
  * Ensures the database and the table exist (else move to the "parent" script)
  */
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index a2347f15a..048bad03d 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -8,10 +8,6 @@ require_once('./libraries/common.lib.php');
  * Runs common work
  */
 require('./tbl_properties_common.php');
-//$err_url   = 'tbl_properties_operations.php' . $err_url;
-$url_query .= '&goto=tbl_properties_operations.php&back=tbl_properties_operations.php';
-$url_params['goto'] = 'tbl_properties_operations.php';
-$url_params['back'] = 'tbl_properties_operations.php';
 
 /**
  * Gets relation settings
@@ -36,7 +32,6 @@ PMA_DBI_select_db($GLOBALS['db']);
 require_once('./libraries/tbl_move_copy.php');
 require('./libraries/tbl_properties_table_info.inc.php');
 
-
 $reread_info = false;
 $errors = array();
 $table_alters = array();
@@ -139,6 +134,12 @@ unset( $reread_info );
  */
 require_once('./libraries/tbl_properties_links.inc.php');
 
+if ( ! isset( $url_params ) ) {
+    $url_params = array();
+}
+$url_params['goto'] = 'tbl_properties_operations.php';
+$url_params['back'] = 'tbl_properties_operations.php';
+
 /**
  * Get columns names
  */