diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 60e23e01..3e0a6d2a 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -924,9 +924,9 @@ class Adminer {
 	*/
 	function homepage() {
 		echo '<p class="links">' . ($_GET["ns"] == "" && support("database") ? '<a href="' . h(ME) . 'database=">' . lang('Alter database') . "</a>\n" : "");
-		echo (support("scheme") ? "<a href='" . h(ME) . "scheme='>" . ($_GET["ns"] != "" ? lang('Alter schema') : lang('Create schema')) . "</a>\n" : "");
-		echo ($_GET["ns"] !== "" ? '<a href="' . h(ME) . 'schema=">' . lang('Database schema') . "</a>\n" : "");
-		echo (support("privileges") ? "<a href='" . h(ME) . "privileges='>" . lang('Privileges') . "</a>\n" : "");
+		echo (support("scheme") ? " | <a href='" . h(ME) . "scheme='>" . ($_GET["ns"] != "" ? lang('Alter schema') : lang('Create schema')) . "</a>\n" : "");
+		echo ($_GET["ns"] !== "" ? ' | <a href="' . h(ME) . 'schema=">' . lang('Database schema') . "</a>\n" : "");
+		echo (support("privileges") ? " | <a href='" . h(ME) . "privileges='>" . lang('Privileges') . "</a>\n" : "");
 		return true;
 	}
 
diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 322444cd..9077d68a 100644
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -11,14 +11,18 @@ function connect_error() {
 
 		page_header(lang('Select database'), $error, false);
 		echo "<p class='links'>\n";
-		foreach (array(
+		$links = array(
 			'database' => lang('Create database'),
 			'privileges' => lang('Privileges'),
 			'processlist' => lang('Process list'),
 			'variables' => lang('Variables'),
 			'status' => lang('Status'),
-		) as $key => $val) {
+		);
+		foreach ($links as $key => $val) {
 			if (support($key)) {
+				if ($key !== array_key_first($links)) {
+					echo " | ";
+				}
 				echo "<a href='" . h(ME) . "$key='>$val</a>\n";
 			}
 		}