diff --git a/ChangeLog b/ChangeLog
index 29f2823d5..67ac851af 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
       calendar.
 
 2004-04-27 Garvin Hicking <pma@supergarv.de>
+    * libraries/display_tbl.lib.php: Bug #942362 - Colspan of results
+      table off by one.
     * db_datadict.php: Bug #942359 - Data dictionary had wrong <div>-
       count. Replace h1 with h2 for consitency
     * libraries/display_tbl.lib.php, tbl_row_delete: Bug #942356,
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 67cf5fa17..44cf285c6 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -521,11 +521,12 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
 
                 if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                     $span = $fields_cnt;
+                    if ($is_display['edit_lnk'] != 'nn') $span++;
+                    if ($is_display['del_lnk'] != 'nn') $span++;
+                    if ($is_display['del_lnk'] != 'kp' && $is_display['del_lnk'] != 'nn') $span++;
                 } else {
                     $span = $num_rows + floor($num_rows/$repeat_cells) + 1;
                 }
-                if ($is_display['edit_lnk'] != 'nn') $span++;
-                if ($is_display['del_lnk'] != 'nn') $span++;
 
                 ?>
 <tr>