diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index cc36aa6b7..5ede9d483 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -22,7 +22,8 @@ require './setup/lib/forms.inc.php';
 
 $formsets = array(
     'features' => array(
-        'forms' => array('Import_export', 'Security', 'Sql_queries', 'Other_core_settings')),
+        'forms' => array('Import_export', 'Security', 'Sql_queries', 'Page_titles',
+                         'Other_core_settings')),
     'left_frame' => array(
         'forms' => array('Left_frame', 'Left_servers', 'Left_databases', 'Left_tables')),
     'main_frame' => array(
diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
index 6eb0e7193..015892fc4 100644
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -99,7 +99,17 @@ $forms['Sql_queries'] = array(
     'QueryHistoryDB',
     'QueryHistoryMax',
     'IgnoreMultiSubmitErrors',
-    'VerboseMultiSubmit');
+    'VerboseMultiSubmit',
+    'MaxCharactersInDisplayedSQL',
+    'EditInWindow',
+    'QueryWindowWidth',
+    'QueryWindowHeight',
+    'QueryWindowDefTab');
+$forms['Page_titles'] = array(
+    'TitleDefault',
+    'TitleTable',
+    'TitleDatabase',
+    'TitleServer');
 $forms['Other_core_settings'] = array(
     'MaxDbList',
     'MaxTableList',
@@ -144,16 +154,26 @@ $forms['Browse'] = array(
     'MaxRows',
     'Order',
     'BrowsePointerEnable',
-    'BrowseMarkerEnable');
+    'BrowseMarkerEnable',
+    'RepeatCells',
+    'LimitChars',
+    'ModifyDeleteAtLeft',
+    'ModifyDeleteAtRight',
+    'DefaultDisplay');
 $forms['Edit'] = array(
     'ProtectBinary',
     'ShowFunctionFields',
+    'ShowFieldTypesInDataEditView',
     'CharEditing',
     'CharTextareaCols',
     'CharTextareaRows',
+    'TextareaCols',
+    'TextareaRows',
+    'LongtextDoubleTextarea',
     'InsertRows',
     'ForeignKeyDropdownOrder',
-    'ForeignKeyMaxLimit');
+    'ForeignKeyMaxLimit',
+    'DefaultPropDisplay');
 $forms['Tabs'] = array(
     'LightTabs',
     'PropertiesIconic',
@@ -182,4 +202,4 @@ $forms['Export_defaults'] = array('Export' => array(
     'file_template_table',
     'file_template_database',
     'file_template_server'));
-?>
+?>
\ No newline at end of file