diff --git a/ChangeLog b/ChangeLog
index 72c4d2b36..3981258dc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-12-18 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_select.php3, bug 648263
+
 2002-12-17 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/russian: update, thanks to Nicolay Zakharov
 
diff --git a/tbl_select.php3 b/tbl_select.php3
index ae28fc99e..db03e3876 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -149,9 +149,13 @@ if (!isset($param) || $param[0] == '') {
             include('./libraries/get_foreign.lib.php3');
 
             echo "\n";
-            if ($foreigners && isset($foreigners[$field]) && isset($disp) && $disp) {
+            // we got a bug report: in some cases, even if $disp is true,
+            // there are no rows, so we add a fetch_array
+            if ($foreigners && isset($foreigners[$field]) && isset($disp) && $disp && @PMA_mysql_fetch_array($disp)) {
                 echo '                    <select name="fields[]">' . "\n";
                 echo '                        <option value=""></option>' . "\n";
+                // go back to first row
+                mysql_data_seek($disp,0);
                 while ($relrow = @PMA_mysql_fetch_array($disp)) {
                     $key   = $relrow[$foreign_field];
                     $value = (($foreign_display != FALSE) ? '-' . htmlspecialchars($relrow[$foreign_display]) : '');