diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 87ba7bf521..efee01ce55 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -194,6 +194,7 @@ $strConfigExport_sql_views_as_tables_name = __('Export views as tables');
 $strConfigExport_sql_metadata_name = __(
     'Export related metadata from phpMyAdmin configuration storage'
 );
+$strConfigExport_sql_create_database_name = sprintf(__('Add %s'), 'CREATE DATABASE / USE');
 $strConfigExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
 $strConfigExport_sql_drop_table_name = sprintf(
     __('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT / TRIGGER'
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index ac42b44cff..e337ab1491 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -316,11 +316,10 @@ $forms['Export']['Sql'] = array('Export' => array(
     'sql_views_as_tables',
     'sql_metadata',
     'sql_compatibility',
-    ':group:' . __('Database export options'),
-        'sql_drop_database',
-        'sql_structure_or_data',
-        ':group:end',
+    'sql_structure_or_data',
     ':group:' . __('Structure'),
+        'sql_drop_database',
+        'sql_create_database',
         'sql_drop_table',
         'sql_procedure_function',
         'sql_create_table' => ':group',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 1a96a91574..07f3072052 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -214,11 +214,10 @@ $forms['Export']['Sql'] = array(
     'Export/sql_views_as_tables',
     'Export/sql_metadata',
     'Export/sql_compatibility',
-    ':group:' . __('Database export options'),
-        'Export/sql_drop_database',
-        'Export/sql_structure_or_data',
-        ':group:end',
+    'Export/sql_structure_or_data',
     ':group:' . __('Structure'),
+        'Export/sql_drop_database',
+        'Export/sql_create_database',
         'Export/sql_drop_table',
         'Export/sql_create_table' => ':group',
             'Export/sql_if_not_exists',