diff --git a/ChangeLog b/ChangeLog
index e337d6f59..0a6893943 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $Source$
     * header.inc.php3: enforce relative url in CSS.
     * tbl_relation.php3:
       - fixed an error when $cfg['Server']['table_info'] is not valid;
+      - optimized a bit;
       - removed an "onchange" js handler to lower server charge.
 
 2002-05-25 Alexander M. Turek  <rabus@users.sourceforge.net>
diff --git a/tbl_relation.php3 b/tbl_relation.php3
index ac47dd47d..7310c2b15 100644
--- a/tbl_relation.php3
+++ b/tbl_relation.php3
@@ -177,22 +177,18 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
     </tr>
     </table>
 </form>
+
     <?php
-} // end if
+    if (!empty($cfg['Server']['table_info'])) {
+        // Get "display_filed" infos
+        $disp_query = 'SELECT display_field FROM ' .  PMA_backquote($cfg['Server']['table_info'])
+                  . ' WHERE table_name = \'' . PMA_sqlAddslashes($table) . '\'';
+        $disp_rs    = mysql_query($disp_query) or PMA_mysqlDie('', $disp_query, '', $err_url_0);
+        $row        = ($disp_rs ? mysql_fetch_array($disp_rs) : '');
+        if (isset($row['display_field'])) {
+            $disp   = $row['display_field'];
+        }
 
-if (!empty($cfg['Server']['table_info'])) {
-    // Get "display_filed" infos
-    $disp_query = 'SELECT display_field FROM ' .  PMA_backquote($cfg['Server']['table_info'])
-                . ' WHERE table_name = \'' . PMA_sqlAddslashes($table) . '\'';
-    $disp_rs    = mysql_query($disp_query) or PMA_mysqlDie('', $disp_query, '', $err_url_0);
-    $row        = ($disp_rs ? mysql_fetch_array($disp_rs) : '');
-    if (isset($row['display_field'])) {
-        $disp   = $row['display_field'];
-    }
-    $col_query  = 'SHOW COLUMNS FROM ' . PMA_backquote($table);
-    $col_rs     = mysql_query($col_query) or PMA_mysqlDie('', $col_query, '', $err_url_0);
-
-    if ($col_rs && mysql_num_rows($col_rs) > 0) {
         echo "\n";
         ?>
 <form method="post" action="tbl_relation.php3" onchange="this.form.submit();">
@@ -206,6 +202,7 @@ if (!empty($cfg['Server']['table_info'])) {
     <select name="display_field">
         <?php
         echo "\n";
+        mysql_data_seek($col_rs, 0);
         while ($row = @mysql_fetch_array($col_rs)) {
             echo '        <option value="' . htmlspecialchars($row['Field']) . '"';
             if (isset($disp) && $row['Field'] == $disp) {