diff --git a/ChangeLog b/ChangeLog
index 7b6b0e523d..c80f6cefc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 - bug #4677 Advanced feature checker does not check for favorite tables feature
 - bug #4678 Some of the data stored in configuration storage are not deleted upon db or table delete
 - bug #4679 Setup does not allow providing a name for favorites table
+- bug #4680 Number of favorite table are not configurable in setup
 
 4.3.4.0 (2014-12-29)
 - bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 7307d0c0d4..68b409efb7 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -172,7 +172,9 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'NavigationTreeEnableGrouping',
     'NavigationTreeDisableDatabaseExpansion',
     'NavigationTreeDisplayItemFilterMinimum',
-    'NumRecentTables');
+    'NumRecentTables',
+    'NumFavoriteTables'
+);
 $forms['Navi_panel']['Navi_servers'] = array(
     'NavigationDisplayServers',
     'DisplayServersList');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 02241c8c89..6792e2e756 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -83,7 +83,9 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'NavigationTreeEnableGrouping',
     'NavigationTreeDisableDatabaseExpansion',
     'NavigationTreeDisplayItemFilterMinimum',
-    'NumRecentTables');
+    'NumRecentTables',
+    'NumFavoriteTables'
+);
 $forms['Navi_panel']['Navi_databases'] = array(
     'NavigationTreeDisplayDbFilterMinimum',
     'NavigationTreeDbSeparator');