diff --git a/browse_foreigners.php b/browse_foreigners.php
index d9fd43a03..4aa582602 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -49,9 +49,9 @@ PMA_setFontSizes();
                 opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]'].value = key;
                 self.close();
                 return false;
-            } else if (opener.document.insertForm.elements['field_' + field + '[1]']) {
+            } else if (opener.document.insertForm.elements['field_' + field + '[<?php echo isset($fieldkey) ? $fieldkey : 0; ?>]']) {
                 // Search form
-                opener.document.insertForm.elements['field_' + field + '[1]'].value = key;
+                opener.document.insertForm.elements['field_' + field + '[<?php echo isset($fieldkey) ? $fieldkey : 0; ?>]'].value = key;
                 self.close();
                 return false;
             }
@@ -87,6 +87,7 @@ require('./libraries/get_foreign.lib.php');
 <form action="browse_foreigners.php" method="post">
 <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 <input type="hidden" name="field" value="<?php echo urlencode($field); ?>" />
+<input type="hidden" name="field" value="<?php echo isset($fieldkey) ? $fieldkey : ''; ?>" />
 <?php
 if (isset($pk)) {
     $pk_uri = '&amp;pk=' . urlencode($pk);
@@ -112,7 +113,7 @@ $nbTotalPage = @ceil($the_total / $session_max_rows);
 
 if ($the_total > $per_page) {
     $gotopage = '<br />' . $GLOBALS['strPageNumber']
-              . '<select name="goToPage" onchange="goToUrl(this, \'browse_foreigners.php?field=' . urlencode($field) . '&amp;' . PMA_generate_common_url($db, $table) . $pk_uri . '&amp;\');">';
+              . '<select name="goToPage" onchange="goToUrl(this, \'browse_foreigners.php?field=' . urlencode($field) . '&amp;' . PMA_generate_common_url($db, $table) . $pk_uri . '&amp;fieldkey=' . (isset($fieldkey) ? $fieldkey : '') . '&amp;\');">';
     if ($nbTotalPage < 200) {
         $firstPage = 1;
         $lastPage  = $nbTotalPage;
diff --git a/libraries/functions.js b/libraries/functions.js
index ea1520347..a4d105870 100644
--- a/libraries/functions.js
+++ b/libraries/functions.js
@@ -830,7 +830,7 @@ function insertValueQuery() {
 /**
   * listbox redirection
   */
-function goToUrl(selObj, goToLocation){
+function goToUrl(selObj, goToLocation) {
     eval("document.location.href = '" + goToLocation + "pos=" + selObj.options[selObj.selectedIndex].value + "'");
 }
 
diff --git a/tbl_select.php b/tbl_select.php
index 7d5f933c4..94a9bfbfd 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -279,7 +279,7 @@ function PMA_tbl_select_operator(f, index, multiple) {
         ?>
             <input type="text"   name="fields[<?php echo $i; ?>]" id="field_<?php echo md5($field); ?>[<?php echo $i; ?>]" class="textfield" />
             <script type="text/javascript" language="javascript">
-                document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
+                document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field); ?>&amp;fieldkey=<?php echo $i; ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
             </script>
         <?php
         } else if (strncasecmp($fields_type[$i], 'enum', 4) == 0) {