diff --git a/ChangeLog b/ChangeLog
index ea129a116..69edd0a0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,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 1d16bfcf0..e6d8a1ba4 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -184,11 +184,13 @@ if (PMA_isValid($_REQUEST['init'])) {
     );
 }
 // always set focus to the textarea
-$js_events[] = array(
-    'object'    => 'window',
-    'event'     => 'load',
-    'function'  => 'PMA_querywindowSetFocus',
-);
+if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') {
+    $js_events[] = array(
+        'object'    => 'window',
+        'event'     => 'load',
+        'function'  => 'PMA_querywindowSetFocus',
+    );
+}
 
 /**
  * start HTTP/HTML output