diff --git a/ChangeLog b/ChangeLog
index 2e241b077..522db7314 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ $Source$
 	* header.inc.php3, lines 64-66; left.php3, lines 135-136 & 154-155: fixed
 	  "bug" #539756 - Bad CSS Styles for textarea have chosen thanks to Rabus.
 	* Documentation.html: code is now XHTML1.0 and CSS2 compliant!
+	* db_details.php3, lines 558; tbl_properties.php3, lines 719: fixed the
+	  second problem reported with bug #536623: space characters typed into the
+	  sql query textarea put the focus at the end of the page with NS6+ and
+	  Moz 0.9.?.
 
 2002-04-05 Marc Delisle  <lem9@users.sourceforge.net>
 	* release 2.2.6-rc1
diff --git a/db_details.php3 b/db_details.php3
index 1d0249104..ecb0abe29 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -555,7 +555,7 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
             <?php echo sprintf($strRunSQLQuery, $db) . ' ' . PMA_showDocuShort('S/E/SELECT.html'); ?>&nbsp;:<br />
             <div style="margin-bottom: 5px">
 <textarea name="sql_query" cols="<?php echo $cfgTextareaCols; ?>" rows="<?php echo $cfgTextareaRows; ?>" wrap="virtual"
-    onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.select();}">
+    onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.form.elements['sql_query'].select();}">
 <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : ''); ?>
 </textarea><br />
             <input type="checkbox" name="show_query" value="y" checked="checked" />&nbsp;
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 3b3161223..b56fd4681 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -716,7 +716,7 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
             <?php echo sprintf($strRunSQLQuery,  htmlspecialchars($db)) . ' ' . PMA_showDocuShort('S/E/SELECT.html'); ?>&nbsp;:<br />
             <div style="margin-bottom: 5px">
 <textarea name="sql_query" rows="<?php echo $cfgTextareaRows; ?>" cols="<?php echo $cfgTextareaCols; ?>" wrap="virtual"
-    onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.select();}">
+    onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.form.elements['sql_query'].select();}">
 <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE 1'); ?>
 </textarea><br />
             <input type="checkbox" name="show_query" value="y" checked="checked" />&nbsp;