diff --git a/ChangeLog b/ChangeLog
index b1eea5138..e9088f504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - undefined PMA_MYSQL_INT_VERSION when no default server is set 
 - bug #1763343 [session] Behavior with session.auto_start enabled 
 + [lang] Hungarian update, thanks to Mihály Mészáros 
+- patch #1837691 [query window] js errors, thanks to Victor Volkov 
 
 2.11.2.2 (2007-11-20)
 - bug #1835123 [security] fixed XSS vulnerability on login page, 
diff --git a/querywindow.php b/querywindow.php
index aeb8c024f..4011d3154 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -221,8 +221,10 @@ if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) {
 if (PMA_isValid($_REQUEST['init'])) {
     echo 'PMA_querywindowResize();' . "\n";
 }
+if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') {
+    echo "document.getElementById('sqlquery').focus();" . "\n";
+}
 ?>
-document.getElementById('sqlquery').focus();
 }
 
 //]]>