diff --git a/html/ajax_search.php b/html/ajax_search.php
index 77a65190c..ba9dc79b7 100644
--- a/html/ajax_search.php
+++ b/html/ajax_search.php
@@ -16,7 +16,7 @@ if (!$_SESSION['authenticated']) {
 $device = array();
 $ports  = array();
 $bgp    = array();
-$limit  = $config['global_search_result_limit'];
+$limit  = $config['webui']['global_search_result_limit'];
 
 if (isset($_REQUEST['search'])) {
     $search = mres($_REQUEST['search']);
diff --git a/html/pages/settings/webui.inc.php b/html/pages/settings/webui.inc.php
new file mode 100644
index 000000000..a5b6bf7f2
--- /dev/null
+++ b/html/pages/settings/webui.inc.php
@@ -0,0 +1,24 @@
+<?php
+
+$no_refresh = true;
+
+$config_groups = get_config_by_group('webui');
+
+$search_conf = array(
+    array('name'               => 'webui.global_search_result_limit',
+          'descr'              => 'Set the max search result limit',
+          'type'               => 'text',
+    ),
+);
+
+echo '
+<div class="panel-group" id="accordion">
+    <form class="form-horizontal" role="form" action="" method="post">
+';
+
+echo generate_dynamic_config_panel('Search settings',true,$config_groups,$search_conf);
+
+echo '
+    </form>
+</div>
+';
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index b4c2730d1..3eefe80a7 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -862,6 +862,3 @@ $config['default_port_association_mode'] = 'ifIndex';
 // See include/polling/ports.inc.php for a lenghty explanation.
 $config['ignore_unmapable_port'] = False;
 
-// Default Global Search result limit
-$config['global_search_result_limit']                   = 8;
-
diff --git a/sql-schema/103.sql b/sql-schema/103.sql
new file mode 100644
index 000000000..c1f56b5f6
--- /dev/null
+++ b/sql-schema/103.sql
@@ -0,0 +1 @@
+INSERT INTO `config` (`config_name`,`config_value`,`config_default`,`config_descr`,`config_group`,`config_group_order`,`config_sub_group`,`config_sub_group_order`,`config_hidden`,`config_disabled`) VALUES ('webui.global_search_result_limit','8','8','Global search results limit','webui',0,'search',0,'1','0');