diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5cd0460e..1fa1a409 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -73,7 +73,8 @@ function adminer_select_val($val, $link) {
 function adminer_message_query($query) {
 	global $SELF;
 	$id = "sql-" . count($_SESSION["messages"]);
-	return call_adminer('message_query', " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre class='jush-sql'>" . htmlspecialchars($query) . '</pre><a href="' . htmlspecialchars($SELF . 'sql=&history=' . count($_SESSION["history"][$_GET["server"]][$_GET["db"]])) . '">' . lang('Edit') . '</a></div>', $query);
+	$_SESSION["history"][$_GET["server"]][$_GET["db"]][] = $query;
+	return call_adminer('message_query', " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre class='jush-sql'>" . htmlspecialchars($query) . '</pre><a href="' . htmlspecialchars($SELF . 'sql=&history=' . (count($_SESSION["history"][$_GET["server"]][$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a></div>', $query);
 }
 
 /** Prints navigation after Adminer title
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 706f46ee..998e0c28 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -107,7 +107,6 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 	$sql = "";
 	if ($query) {
 		$sql = adminer_message_query($query);
-		$_SESSION["history"][$_GET["server"]][$_GET["db"]][] = $query;
 	}
 	if ($execute) {
 		$failed = !$dbh->query($query);