diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index b8d86530..75965051 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -4,10 +4,10 @@ class Adminer {
 	var $operators;
 	
 	/** Name in title and navigation
-	* @return string
+	* @return string HTML code
 	*/
 	function name() {
-		return "Adminer";
+		return "<a href='http://www.adminer.org/' id='h1'>Adminer</a>";
 	}
 	
 	/** Connection parameters
@@ -719,8 +719,7 @@ DROP PROCEDURE adminer_alter;
 		global $VERSION, $connection, $token, $jush, $drivers;
 		?>
 <h1>
-<a href="http://www.adminer.org/" id="h1"><?php echo $this->name(); ?></a>
-<span class="version"><?php echo $VERSION; ?></span>
+<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
 <a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
 </h1>
 <?php
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 47137255..0fbde415 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -4,7 +4,7 @@ class Adminer {
 	var $_values = array();
 	
 	function name() {
-		return lang('Editor');
+		return "<a href='http://www.adminer.org/editor/' id='h1'>" . lang('Editor') . "</a>";
 	}
 	
 	//! driver, ns
@@ -511,8 +511,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		global $VERSION, $token;
 		?>
 <h1>
-<a href="http://www.adminer.org/" id="h1"><?php echo $this->name(); ?></a>
-<span class="version"><?php echo $VERSION; ?></span>
+<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
 <a href="http://www.adminer.org/editor/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
 </h1>
 <?php