diff --git a/ChangeLog b/ChangeLog
index 0fab80d03..ad66e8ff3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - [export] patch #1766633 Incorrect export with specified MySQL port,
   thanks to Juergen Wind
 + [lang] Catalan update, thanks to Xavier Navarro 
+- bug #1751553 Drop-down instead of input when editing
 
 2.10.3.0 (2007-07-20)
 
diff --git a/libraries/get_foreign.lib.php b/libraries/get_foreign.lib.php
index ddc6eb8b5..4d4e1a7be 100644
--- a/libraries/get_foreign.lib.php
+++ b/libraries/get_foreign.lib.php
@@ -60,7 +60,7 @@ if ($foreigners && isset($foreigners[$field])) {
         }
 
         $disp            = PMA_DBI_query($f_query_main . $f_query_from . $f_query_filter . $f_query_order . $f_query_limit);
-        if ($disp) {
+        if ($disp && PMA_DBI_num_rows($disp) > 0) {
             // garvin: If a resultset has been created, pre-cache it in the $disp_row array
             // This helps us from not needing to use mysql_data_seek by accessing a pre-cached
             // PHP array. Usually those resultsets are not that big, so a performance hit should