diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php
index 963cae82..89f874f1 100644
--- a/adminer/include/export.inc.php
+++ b/adminer/include/export.inc.php
@@ -154,7 +154,6 @@ function dump_headers($identifier, $multi_table = false) {
 	return $ext;
 }
 
-$dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>"
-	. " <select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>"
-;
+$dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>";
+$dump_format = "<select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>";
 $max_packet = 1048576; // default, minimum is 1024
diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index 12ae373e..65e9119b 100644
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Výstup',
 	'open' => 'otevřít',
 	'save' => 'uložit',
+	'Format' => 'Formát',
 	'Tables' => 'Tabulky',
 	'Data' => 'Data',
 	'Event has been dropped.' => 'Událost byla odstraněna.',
diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php
index 257b7728..209133a7 100644
--- a/adminer/lang/de.inc.php
+++ b/adminer/lang/de.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Ergebnis',
 	'open' => 'anzeigen',
 	'save' => 'Datei',
+	'Format' => 'Format',
 	'Tables' => 'Tabellen',
 	'Data' => 'Daten',
 	'Event has been dropped.' => 'Ereignis entfernt.',
diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php
index 9e5ac875..f8b89fec 100644
--- a/adminer/lang/es.inc.php
+++ b/adminer/lang/es.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Salida',
 	'open' => 'mostrar',
 	'save' => 'archivo',
+	'Format' => 'Formato',
 	'Tables' => 'Tablas',
 	'Data' => 'Datos',
 	'Event has been dropped.' => 'Evento eliminado.',
diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php
index 1a630c0b..1076d0e5 100644
--- a/adminer/lang/et.inc.php
+++ b/adminer/lang/et.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Väljund',
 	'open' => 'näita brauseris',
 	'save' => 'salvesta failina',
+	'Format' => 'Formaat',
 	'Functions' => 'Funktsioonid',
 	'Aggregation' => 'Liitmine',
 	'Event has been dropped.' => 'Sündmus on edukalt kustutatud.',
diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index 32ac31c9..e1b79ccc 100644
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Sortie',
 	'open' => 'ouvrir',
 	'save' => 'sauvegarder',
+	'Format' => 'Formatter',
 	'Functions' => 'Fonctions',
 	'Aggregation' => 'Agrégation',
 	'Event has been dropped.' => 'L\'évènement a été supprimé.',
diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php
index f7b9719d..5855011f 100644
--- a/adminer/lang/it.inc.php
+++ b/adminer/lang/it.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Risultato',
 	'open' => 'apri',
 	'save' => 'salva',
+	'Format' => 'Formato',
 	'Tables' => 'Tabelle',
 	'Data' => 'Dati',
 	'Event has been dropped.' => 'Evento eliminato.',
diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index 3860d495..91d4eff2 100644
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Uitvoer',
 	'open' => 'openen',
 	'save' => 'opslaan',
+	'Format' => 'Formaat',
 	'Functions' => 'Functies',
 	'Aggregation' => 'Totalen',
 	'Event has been dropped.' => 'Event werd verwijderd.',
diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php
index ed4a662a..925db8fc 100644
--- a/adminer/lang/ru.inc.php
+++ b/adminer/lang/ru.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Выходные данные',
 	'open' => 'открыть',
 	'save' => 'сохранить',
+	'Format' => 'Формат',
 	'Tables' => 'Таблицы',
 	'Data' => 'Данные',
 	'Event has been dropped.' => 'Событие было удалено.',
diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php
index 9ff4cfdc..c90dfcb9 100644
--- a/adminer/lang/sk.inc.php
+++ b/adminer/lang/sk.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => 'Výstup',
 	'open' => 'otvoriť',
 	'save' => 'uložiť',
+	'Format' => 'Formát',
 	'Tables' => 'Tabuľky',
 	'Data' => 'Dáta',
 	'Event has been dropped.' => 'Udalosť bola odstránená.',
diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php
index a1a22586..4c00d15b 100644
--- a/adminer/lang/zh-tw.inc.php
+++ b/adminer/lang/zh-tw.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => '輸出',
 	'open' => '打開',
 	'save' => '儲存',
+	'Format' => '格式',
 	'Functions' => '函數',
 	'Aggregation' => '集合',
 	'Event has been dropped.' => '已丟棄事件。',
diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php
index 57f9756d..fe6e6d48 100644
--- a/adminer/lang/zh.inc.php
+++ b/adminer/lang/zh.inc.php
@@ -151,6 +151,7 @@ $translations = array(
 	'Output' => '输出',
 	'open' => '打开',
 	'save' => '保存',
+	'Format' => '格式',
 	'Functions' => '函数',
 	'Aggregation' => '集合',
 	'Event has been dropped.' => '已丢弃事件。',
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 9a7ebe9a..aa2a7068 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -297,7 +297,7 @@ if (!$columns) {
 			echo " (" . lang('%d row(s)', $found_rows) . ') <label><input type="checkbox" name="all" value="1">' . lang('whole result') . "</label>\n";
 			
 			echo (information_schema($_GET["db"]) ? "" : "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' name='edit' value='" . lang('Edit') . "'> <input type='submit' name='clone' value='" . lang('Clone') . "'> <input type='submit' name='delete' value='" . lang('Delete') . "'$confirm></div></fieldset>\n");
-			echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_output <input type='submit' name='export' value='" . lang('Export') . "'></div></fieldset>\n";
+			echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_output $dump_format <input type='submit' name='export' value='" . lang('Export') . "'></div></fieldset>\n";
 		}
 		echo "<fieldset><legend>" . lang('CSV Import') . "</legend><div><input type='hidden' name='token' value='$token'><input type='file' name='csv_file'> <input type='submit' name='import' value='" . lang('Import') . "'></div></fieldset>\n";
 		
diff --git a/editor/include/export.inc.php b/editor/include/export.inc.php
index cc52b224..063835ec 100644
--- a/editor/include/export.inc.php
+++ b/editor/include/export.inc.php
@@ -21,4 +21,5 @@ function dump_headers($identifier) {
 	return $ext;
 }
 
-$dump_output = "CSV";
+$dump_output = "";
+$dump_format = "CSV";