diff --git a/ChangeLog b/ChangeLog
index 01d1357015..b76d296c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@ phpMyAdmin - ChangeLog
 
 3.4.6.0 (not yet released)
 - patch #3404173 InnoDB comment display with tooltips/aliases
+- bug #3404886 [navi] Edit SQL statement after error
 
 3.4.5.0 (not yet released)
 - bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index dc7d152180..b65405b79e 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -578,12 +578,12 @@ $is_modify_link = true, $back_url = '', $exit = true)
             if (strlen($table)) {
                 $_url_params['db'] = $db;
                 $_url_params['table'] = $table;
-                $doedit_goto = '<a href="tbl_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+                $doedit_goto = '<a href="tbl_sql.php' . PMA_generate_common_url($_url_params) . '">';
             } elseif (strlen($db)) {
                 $_url_params['db'] = $db;
-                $doedit_goto = '<a href="db_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+                $doedit_goto = '<a href="db_sql.php' . PMA_generate_common_url($_url_params) . '">';
             } else {
-                $doedit_goto = '<a href="server_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+                $doedit_goto = '<a href="server_sql.php' . PMA_generate_common_url($_url_params) . '">';
             }
 
             $error_msg_output .= $doedit_goto