diff --git a/ChangeLog b/ChangeLog
index e8dc733793..05f99e204b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.6.2 (not yet released)
 - issue #12225 Use https for documentation links
+- issue #12234 Fix schema export with too many tables
 
 4.6.1 (2016-05-02)
 - issue #12120 PMA_Util not found in insert_edit.lib.php
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 3e9614a23b..cb9093adb9 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -1039,10 +1039,16 @@ function Export_pages()
             PMA_ajaxRemoveMessage($msgbox);
 
             var $form = $(data.message);
-            $form.attr('action', $form.attr('action') + '?' + (Get_url_pos(true).substring(1)));
             if (!pmd_tables_enabled) {
                 $form.append('<input type="hidden" name="offline_export" value="true" />');
             }
+            $.each(Get_url_pos(true).substring(1).split('&'), function() {
+                var pair = this.split('=');
+                var input = $('<input type="hidden" />');
+                input.attr('name', pair[0]);
+                input.attr('value', pair[1]);
+                $form.append(input);
+            });
             var $formatDropDown = $form.find('#plugins');
             $formatDropDown.change(function() {
                 var format = $formatDropDown.val();
diff --git a/templates/database/designer/schema_export.phtml b/templates/database/designer/schema_export.phtml
index a31818785e..c01f6a7dea 100644
--- a/templates/database/designer/schema_export.phtml
+++ b/templates/database/designer/schema_export.phtml
@@ -8,4 +8,4 @@
         <input type="hidden" name="page_number" value="<?= htmlspecialchars($page); ?>" />
         <?= PMA_pluginGetOptions('Schema', $export_list); ?>
     </fieldset>
-</form>
\ No newline at end of file
+</form>