diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 2437ee66..49a85fda 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -483,7 +483,7 @@ document.getElementById('username').focus();
 	* @return null
 	*/
 	function navigation($missing) {
-		global $VERSION, $connection, $token;
+		global $VERSION, $connection, $token, $driver;
 		?>
 <h1>
 <a href="http://www.adminer.org/" id="h1"><?php echo $this->name(); ?></a>
@@ -519,6 +519,17 @@ document.getElementById('username').focus();
 					echo "<p class='message'>" . lang('No tables.') . "\n";
 				} else {
 					$this->tablesPrint($tables);
+					$links = array();
+					foreach ($tables as $table => $type) {
+						$links[] = preg_quote($table, '/');
+					}
+					echo "<script type='text/javascript'>\n";
+					echo "var jushLinks = { $driver: [ '" . addcslashes(h(ME), "\\'/") . "table=\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+					echo "jushLinks.bac = jushLinks.$driver;\n";
+					echo "jushLinks.bra = jushLinks.$driver;\n";
+					echo "jushLinks.mssql_bra = jushLinks.$driver;\n";
+					echo "jushLinks.sqlite_quo = jushLinks.$driver;\n";
+					echo "</script>\n";
 				}
 				echo '<p><a href="' . h(ME) . 'create=">' . bold(lang('Create new table'), $_GET["create"] === "") . "</a>\n";
 			}
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 189d9bfb..d6673896 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -15,6 +15,9 @@ function bodyLoad(version) {
 			jush.urls.sqlset[0] = jush.urls.sql[0];
 			jush.urls.sqlstatus[0] = jush.urls.sql[0];
 			jush.style(jushRoot + 'jush.css');
+			if (window.jushLinks) {
+				jush.custom_links = jushLinks;
+			}
 			jush.highlight_tag('pre', 0);
 			jush.highlight_tag('code');
 		}
diff --git a/changes.txt b/changes.txt
index 4d0ef62f..0df572fd 100644
--- a/changes.txt
+++ b/changes.txt
@@ -9,6 +9,7 @@ Allow semicolon as CSV separator
 Autofocus username in login form
 Disable spellchecking in SQL textareas
 Japanese translation
+Link table names in SQL queries
 Defer table information in database overview to JavaScript (performance)
 Big tables optimizations (performance)