diff --git a/ChangeLog b/ChangeLog
index 5ec9170e7..17c2acdf2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-09-15 Garvin Hicking <me@supergarv.de>
+    * Fixed foreign key browser window to also work from within
+      Search-subpanel.
+
 2004-09-14 Marc Delisle  <lem9@users.sourceforge.net>
     * server_privileges.php: stay on the form when passwords don't match
       (after the js alert)
@@ -14,7 +18,7 @@ $Source$
 2004-09-14 Michal Čihař  <michal@cihar.com>
     * themes.php, libraries/common.lib.php, libraries/defines.lib.php,
       libraries/select_theme.lib.php, themes/darkblue_orange/info.inc.php,
-	  themes/original/info.inc.php: Better theme version check (bug #1023029).
+      themes/original/info.inc.php: Better theme version check (bug #1023029).
     * libraries/auth/cookie.auth.lib.php: Remember database when using cookie
       login (bug #1027873).
 
diff --git a/browse_foreigners.php b/browse_foreigners.php
index 832317202..d9fd43a03 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -43,12 +43,21 @@ PMA_setFontSizes();
     <script type="text/javascript" language="javascript">
     self.focus();
     function formupdate(field, key) {
-        if (opener && opener.document && opener.document.insertForm && opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]']) {
-            opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]'].value = key;
-            self.close();
-        } else {
-            alert('<?php echo PMA_jsFormat($strWindowNotFound); ?>');
+        if (opener && opener.document && opener.document.insertForm) {
+            if (opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]']) {
+                // Edit/Insert form
+                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]']) {
+                // Search form
+                opener.document.insertForm.elements['field_' + field + '[1]'].value = key;
+                self.close();
+                return false;
+            }
         }
+
+        alert('<?php echo PMA_jsFormat($strWindowNotFound); ?>');
     }
     </script>
 </head>