diff --git a/js/export.js b/js/export.js
index 03dd329249..1b899ec2b8 100644
--- a/js/export.js
+++ b/js/export.js
@@ -229,7 +229,7 @@ function check_time_out(time_limit)
         'check_time_out' : true
     };
      clearTimeout(time_out);
-     time_out = setTimeout(function(){        
+     time_out = setTimeout(function(){
          $.get(href, params, function (data) {
             if (data['message'] !== 'success') {
                 PMA_ajaxShowMessage(
@@ -241,19 +241,11 @@ function check_time_out(time_limit)
             }
         });
      }, time_limit * 1000);
-     
+
 }
 AJAX.registerOnload('export.js', function () {
     $("input[type='radio'][name='quick_or_custom']").change(toggle_quick_or_custom);
 
-    /**
-     * Sets up the interface for Javascript-enabled browsers since the default is for
-     *  Javascript-disabled browsers
-     * TODO: drop non-JS behaviour
-     */
-    if ($("input[type='hidden'][name='export_method']").val() != "custom-no-form") {
-        $("#quick_or_custom").show();
-    }
     $("#scroll_to_options_msg").hide();
     $("#format_specific_opts div.format_specific_options")
     .hide()
diff --git a/test/selenium/PmaSeleniumExportTest.php b/test/selenium/PmaSeleniumExportTest.php
index 767a4fb9fd..a632dc6010 100644
--- a/test/selenium/PmaSeleniumExportTest.php
+++ b/test/selenium/PmaSeleniumExportTest.php
@@ -162,7 +162,7 @@ class PMA_SeleniumExportTest extends PMA_SeleniumBase
         /*
          * FIXME: There should be better way to wait for javascript to be executed
          */
-        usleep(200);
+        usleep(500);
         $this->byCssSelector("label[for=radio_custom_export]")->click();
 
         if ($type == 'server') {
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index f6326906f4..5d4d738e4f 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -243,7 +243,7 @@ fieldset .formelement {
         clear: none;
     }
     #relationalTable td:first-child + td {
-        width: 25%;  
+        width: 25%;
     }
     #relationalTable td:first-child + td select {
         width: 32%;
@@ -251,8 +251,8 @@ fieldset .formelement {
     }
     #relationalTable {
         width: 100%;
-    }  
-    
+    }
+
 }
 
 /* revert for Gecko */
@@ -820,7 +820,7 @@ div#tablestatistics table {
     font-weight: bold;
     font-style: italic;
     white-space: nowrap;
-    margin-left: 10px;  
+    margin-left: 10px;
     color: #D6D6D6;
     text-shadow: none;
 }
@@ -1588,7 +1588,6 @@ select#table_select {
     margin-bottom: 0;
 }
 
-#quick_or_custom,
 #output_quick_export {
     display: none;
 }
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 4c5e0158d5..450d418004 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1125,7 +1125,7 @@ div#tablestatistics table {
     font-weight: bold;
     font-style: italic;
     white-space: nowrap;
-    margin-left: 10px;  
+    margin-left: 10px;
     color: #D6D6D6;
     text-shadow: none;
 }
@@ -2080,7 +2080,6 @@ select#table_select {
     margin-bottom: 0;
 }
 
-#quick_or_custom,
 #output_quick_export {
     display: none;
 }
@@ -2808,7 +2807,7 @@ fieldset .disabled-field td {
     padding: 0;
 }
 
-.cEdit .edit_area {   
+.cEdit .edit_area {
     background: #FFF;
     border: 1px solid #999;
     min-width: 10em;