diff --git a/ChangeLog b/ChangeLog
index 776e1fe8a..48c069e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [privileges] Support password hashing on the Edit Privileges interface 
 - bug #1755339 Warn about rename dataase actually being copy/delete
 - bug #1746921 Left frame shrinks on db change, thanks to Juergen Wind
++ [gui] Export: Select All/Unselect All over the choices,
+  thanks to Florian Schmitz
 
 2.10.3.0 (2007-07-20)
 
diff --git a/db_export.php b/db_export.php
index e8c4de49b..89bce317e 100644
--- a/db_export.php
+++ b/db_export.php
@@ -32,7 +32,16 @@ if ($num_tables < 1) {
     exit;
 } // end if
 
-$multi_values = '<div align="center"><select name="table_select[]" size="6" multiple="multiple">';
+$checkall_url = 'db_export.php?'
+              . PMA_generate_common_url($db)
+              . '&amp;goto=db_export.php';
+
+$multi_values = '<div align="center">';
+$multi_values .= '<a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'table_select[]\', true); return false;">' . $strSelectAll . '</a>
+        /
+        <a href="' . $checkall_url . '&amp;unselectall=1" onclick="setSelectOptions(\'dump\', \'table_select[]\', false); return false;">' . $strUnselectAll . '</a><br />';
+
+$multi_values .= '<select name="table_select[]" size="6" multiple="multiple">';
 $multi_values .= "\n";
 
 foreach ($tables as $each_table) {
@@ -54,16 +63,7 @@ foreach ($tables as $each_table) {
         . str_replace(' ', '&nbsp;', $table_html) . '</option>' . "\n";
 } // end for
 $multi_values .= "\n";
-$multi_values .= '</select></div>';
-
-$checkall_url = 'db_export.php?'
-              . PMA_generate_common_url($db)
-              . '&amp;goto=db_export.php';
-
-$multi_values .= '<br />
-        <a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'table_select[]\', true); return false;">' . $strSelectAll . '</a>
-        /
-        <a href="' . $checkall_url . '&amp;unselectall=1" onclick="setSelectOptions(\'dump\', \'table_select[]\', false); return false;">' . $strUnselectAll . '</a>';
+$multi_values .= '</select></div><br />';
 
 $export_type = 'database';
 require_once './libraries/display_export.lib.php';
diff --git a/server_export.php b/server_export.php
index 45a405963..7505710d7 100644
--- a/server_export.php
+++ b/server_export.php
@@ -18,7 +18,16 @@ $js_to_run = 'functions.js';
 require './libraries/server_links.inc.php';
 
 $export_page_title = $strViewDumpDatabases . "\n";
-$multi_values = '<div align="center"><select name="db_select[]" size="6" multiple="multiple">';
+$checkall_url = 'server_export.php?'
+              . PMA_generate_common_url()
+              . '&amp;goto=db_export.php';
+
+$multi_values = '<div align="center">';
+$multi_values .= '<a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'db_select[]\', true); return false;">' . $strSelectAll . '</a>
+        /
+        <a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'db_select[]\', false); return false;">' . $strUnselectAll . '</a><br />';
+
+$multi_values .= '<select name="db_select[]" size="6" multiple="multiple">';
 $multi_values .= "\n";
 
 foreach ($GLOBALS['PMA_List_Database']->items as $current_db) {
@@ -31,17 +40,7 @@ foreach ($GLOBALS['PMA_List_Database']->items as $current_db) {
     $multi_values .= '                <option value="' . $current_db . '"' . $is_selected . '>' . $current_db . '</option>' . "\n";
 } // end while
 $multi_values .= "\n";
-$multi_values .= '</select></div>';
-
-$checkall_url = 'server_export.php?'
-              . PMA_generate_common_url()
-              . '&amp;goto=db_export.php';
-
-$multi_values .= '<br />
-        <a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'db_select[]\', true); return false;">' . $strSelectAll . '</a>
-        /
-        <a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'db_select[]\', false); return false;">' . $strUnselectAll . '</a>
-        <br /><br />';
+$multi_values .= '</select></div><br />';
 
 $export_type = 'server';
 require_once './libraries/display_export.lib.php';