diff --git a/ChangeLog b/ChangeLog
index 989e6706b..0bbfae195 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2356433 [display] HeaderFlipType "fake" problems,
   thanks to Michal Biniek
 - bug #2363919 [display] Incorrect size for view 
+- bug #2121287 [display] Drop-down menu blinking in FF 
 
 3.1.0.0 (2008-11-28)
 + [auth] Support for Swekey hardware authentication,
diff --git a/tbl_structure.php b/tbl_structure.php
index c077a7568..e7930107b 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -512,12 +512,8 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
     }
     echo sprintf($strAddFields, '<input type="text" name="num_fields" size="2" maxlength="2" value="1" style="vertical-align: middle" onfocus="this.select()" />');
 
-    // here we want to display a field selector inside the label for
-    // the After choice, and $strAfter contains a parameter to display
-    // this selector at the best place for each language; thus we
-    // set the fifth parameter of PMA_generate_html_radio() to false
-    // in order to avoid the usual escaping with htmlspecialchars() inside
-    // the label
+    // I tried displaying the drop-down inside the label but with Firefox
+    // the drop-down was blinking
     $fieldOptions = '<select name="after_field" style="vertical-align: middle" onclick="this.form.field_where[2].checked=true" onchange="this.form.field_where[2].checked=true">';
     foreach ($aryFields as $fieldname) {
         $fieldOptions .= '<option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n";
@@ -528,9 +524,10 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
     $choices = array(
         'last'  => $strAtEndOfTable,
         'first' => $strAtBeginningOfTable,
-        'after' => sprintf($strAfter, $fieldOptions)
+        'after' => sprintf($strAfter, '')
     );
-    PMA_generate_html_radio('field_where', $choices, 'last', false, false);
+    PMA_generate_html_radio('field_where', $choices, 'last', false);
+    echo $fieldOptions;
     unset($fieldOptions, $choices);
     ?>
 <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" />