diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 9e0ac3f5..8ad1c3ec 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -83,7 +83,7 @@ class Adminer {
 			$links["edit"] = lang('New item');
 		}
 		foreach ($links as $key => $val) {
-			echo " <a href='" . h(ME) . "$key=" . urlencode($tableStatus["Name"]) . ($key == "edit" ? $set : "") . "'>" . (isset($_GET[$key]) ? "<b>$val</b>" : $val) . "</a>";
+			echo " <a href='" . h(ME) . "$key=" . urlencode($tableStatus["Name"]) . ($key == "edit" ? $set : "") . "'>" . bold($val, isset($_GET[$key])) . "</a>";
 		}
 		echo "\n";
 	}
@@ -480,8 +480,8 @@ class Adminer {
 			?>
 <form action="" method="post">
 <p class="logout">
-<a href="<?php echo h(ME); ?>sql="><?php echo lang('SQL command'); ?></a>
-<a href="<?php echo h(ME); ?>dump=<?php echo urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]); ?>"><?php echo lang('Dump'); ?></a>
+<a href="<?php echo h(ME); ?>sql="><?php echo bold(lang('SQL command'), isset($_GET["sql"])); ?></a>
+<a href="<?php echo h(ME); ?>dump=<?php echo urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]); ?>"><?php echo bold(lang('Dump'), isset($_GET["dump"])); ?></a>
 <input type="hidden" name="token" value="<?php echo $_SESSION["tokens"][$_GET["server"]]; ?>">
 <input type="submit" name="logout" value="<?php echo lang('Logout'); ?>">
 </p>
@@ -505,7 +505,7 @@ class Adminer {
 				} else {
 					$this->tablesPrint($tables);
 				}
-				echo '<p><a href="' . h(ME) . 'create=">' . lang('Create new table') . "</a>\n";
+				echo '<p><a href="' . h(ME) . 'create=">' . bold(lang('Create new table'), $_GET["create"] === "") . "</a>\n";
 			}
 		}
 	}
@@ -517,8 +517,8 @@ class Adminer {
 	function tablesPrint($tables) {
 		echo "<p id='tables'>\n";
 		foreach ($tables as $table) {
-			echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '">' . lang('select') . '</a> ';
-			echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '">' . $this->tableName(array("Name" => $table)) . "</a><br>\n"; //! Adminer::tableName may work with full table status
+			echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '">' . bold(lang('select'), $_GET["select"] == $table) . '</a> ';
+			echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '">' . bold($this->tableName(array("Name" => $table)), $_GET["table"] == $table) . "</a><br>\n"; //! Adminer::tableName may work with full table status
 		}
 	}
 	
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index c9b5a1b7..801cdeb3 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -526,3 +526,12 @@ function is_url($string) {
 function print_fieldset($id, $legend, $visible = false) {
 	echo "<fieldset><legend><a href='#fieldset-$id' onclick=\"return !toggle('fieldset-$id');\">$legend</a></legend><div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
 }
+
+/** Enclose $string to <b> if $bold is true
+* @param string
+* @param bool
+* @return string
+*/
+function bold($string, $bold) {
+	return ($bold ? "<b>$string</b>" : $string);
+}
diff --git a/changes.txt b/changes.txt
index b9806ef1..5525f75a 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 2.2.1-dev:
+Highlight current links
 Improve concurrency
 Move number of tables to DB info (performance)
 Search by foreign keys (Editor)
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index cfb2d167..f2510843 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -466,7 +466,7 @@ ORDER BY ORDINAL_POSITION");
 		foreach ($tables as $row) {
 			$name = $this->tableName($row);
 			if (isset($row["Engine"]) && strlen($name)) { // ignore views and tables without name
-				echo "<a href='" . h(ME) . 'select=' . urlencode($row["Name"]) . "'>$name</a><br>\n";
+				echo "<a href='" . h(ME) . 'select=' . urlencode($row["Name"]) . "'>" . bold($name, $_GET["select"] == $row["Name"]) . "</a><br>\n";
 			}
 		}
 	}