diff --git a/ChangeLog b/ChangeLog
index 1e8a5c94e..7ec94a815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1807816 [search] regular expression search doesn't work with
   backslashes
 - bug #1843463 [GUI] DROP PROCEDURE does not show alert
+- bug #1835904 [GUI] Back link after a SQL error forgets the query
 
 2.11.3.0 (not yet released)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/db_sql.php b/db_sql.php
index 13918438a..10d581907 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -16,6 +16,11 @@ require_once './libraries/common.inc.php';
 require './libraries/db_common.inc.php';
 require_once './libraries/sql_query_form.lib.php';
 
+// After a syntax error, we return to this script
+// with the typed query in the textarea.
+$goto = 'db_sql.php';
+$back = 'db_sql.php';
+
 /**
  * Gets informations about the database and, if it is empty, move to the
  * "db_structure.php" script where table can be created
diff --git a/tbl_sql.php b/tbl_sql.php
index 4bce7b98b..76500597c 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -19,6 +19,8 @@ $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
 require_once './libraries/sql_query_form.lib.php';
 
 $err_url   = 'tbl_sql.php' . $err_url;
+// After a syntax error, we return to this script
+// with the typed query in the textarea.
 $goto = 'tbl_sql.php';
 $back = 'tbl_sql.php';