diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 530b0f357..94ae54b69 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -151,6 +151,7 @@ div#left_tableList ul ul {
 /* querybox */
 
 /* Gecko bug */
+div[class=formelementrow],
 div[id=queryfieldscontainer] {
     border: 1px solid transparent;
 }
@@ -180,8 +181,9 @@ textarea#sqlquery {
 div#queryboxcontainer div#bookmarkoptions {
     margin-top: 0.5em;
 }
+/* end querybox */
+
 
-fieldset .formelementrow,
 fieldset .formelement {
     line-height: 2.4em;
     float: left;
@@ -190,23 +192,17 @@ fieldset .formelement {
     white-space: nowrap;
 }
 /* revert for Gecko */
-fieldset div[class=formelementrow],
 fieldset div[class=formelement] {
     white-space: normal;
 }
 
 /* IE */
-fieldset .formelementrow input,
-fieldset .formelementrow select,
 fieldset .formelement input,
 fieldset .formelement select {
     margin-top: 0.5em;
     margin-bottom: 0.5em;
-    height: 1.3em;
 }
 /* revert for Gecko */
-fieldset div[class=formelementrow] input,
-fieldset div[class=formelementrow] select,
 fieldset div[class=formelement] input,
 fieldset div[class=formelement] select {
     margin-top: auto;
@@ -214,15 +210,10 @@ fieldset div[class=formelement] select {
     height: auto;
 }
 
-fieldset .formelementrow {
-    clear: left;
-    float: none;
+#fieldsetexport #exportoptions {
+    float: left;
 }
 
-
-/* end querybox */
-
-
 /* Calendar */
 table.calendar      { width: 100%; }
 table.calendar td   { text-align: center; }
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index f34735ca0..3ffe0b83e 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -136,6 +136,7 @@ foreach($import_list as $key => $val) {
 echo '<div class="formelement">' . "\n";
 echo PMA_displayMaximumUploadSize($max_upload_size);
 echo '</div>' . "\n";
+echo '<div class="clearfloat"></div>' . "\n";
 echo '</div>' . "\n";
 // some browsers should respect this :)
 echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";