diff --git a/ChangeLog b/ChangeLog
index b2d8d3d52..44890897a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-12-13 Michal Čihař  <michal@cihar.com>
+    * querywindow.php: Fix query history displaying (bug #1374639).
+
 2005-12-12 Michal Čihař  <michal@cihar.com>
     * scripts/setup.php: Use same format of version file as in upgrade.pl.
 
diff --git a/querywindow.php b/querywindow.php
index a5d58138b..771932087 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -178,7 +178,7 @@ if ( ! empty( $query_history_latest ) && ! empty( $query_history_latest_db ) ) {
 
     $_sql_history[$query_history_latest] = array(
         'db'    =>  $query_history_latest_db,
-        'table' => isset( $query_history_latest_table ) ? $query_history_latest_table : '',
+        'table' => isset($query_history_latest_table) ? $query_history_latest_table : '',
     );
 
     $sql_query = urldecode($query_history_latest);
@@ -213,8 +213,8 @@ if ( $GLOBALS['cfg']['QueryHistoryDB'] && $cfgRelation['historywork'] ) {
         foreach ($query_history AS $query_no => $query_sql) {
             if ( ! isset( $_input_query_history[$query_sql] ) ) {
                 $_input_query_history[$query_sql] = array(
-                    'db'    => $query_history_db,
-                    'table' => isset($query_history_table) ? $query_history_table : '',
+                    'db'    => $query_history_db[$query_no],
+                    'table' => isset($query_history_table[$query_no]) ? $query_history_table[$query_no] : '',
                 );
                 $_sql_history[$query_sql] = array(
                     'db'    => $query_history_db[$query_no],