diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index b97bb539e3..b471fee3fc 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -668,13 +668,6 @@ class InvenTreeSetting(BaseInvenTreeSetting):
             'validator': bool,
         },
 
-        'SEARCH_PREVIEW_RESULTS': {
-            'name': _('Search Preview Results'),
-            'description': _('Number of results to show in search preview window'),
-            'default': 10,
-            'validator': [int, MinValueValidator(1)]
-        },
-
         'STOCK_ENABLE_EXPIRY': {
             'name': _('Stock Expiry'),
             'description': _('Enable stock expiry functionality'),
@@ -857,6 +850,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
             'default': True,
             'validator': bool,
         },
+
+        'SEARCH_PREVIEW_RESULTS': {
+            'name': _('Search Preview Results'),
+            'description': _('Number of results to show in search preview window'),
+            'default': 10,
+            'validator': [int, MinValueValidator(1)]
+        },
     }
 
     class Meta:
diff --git a/InvenTree/templates/InvenTree/settings/global.html b/InvenTree/templates/InvenTree/settings/global.html
index d43bec80c0..1723f36b72 100644
--- a/InvenTree/templates/InvenTree/settings/global.html
+++ b/InvenTree/templates/InvenTree/settings/global.html
@@ -22,16 +22,4 @@
     </tbody>
 </table>
 
-<table class='table table-striped table-condensed'>
-    {% include "InvenTree/settings/header.html" %}
-    <tbody>
-</table>
-
-<h4>{% trans "Search Settings" %}</h4>
-<table class='table table-striped table-condensed'>
-    <tbody>
-        {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_RESULTS" icon="fa-search" %}
-    </tbody>
-</table>
-
 {% endblock %}
diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html
index ca38d9bc6b..e3c00f60be 100644
--- a/InvenTree/templates/InvenTree/settings/navbar.html
+++ b/InvenTree/templates/InvenTree/settings/navbar.html
@@ -24,6 +24,12 @@
         </a>
     </li>
 
+    <li class='list-group-item' title='{% trans "Search" %}'>
+        <a href='#' class='nav-toggle' id='select-user-search'>
+            <span class='fas fa-search'></span> {% trans "Search" %}
+        </a>
+    </li>
+
     <!--
         <li class='list-group-item' title='{% trans "Settings" %}'>
             <a href='#' class='nav-toggle' id='select-user-settings'>
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index 61b1d3ead1..bb3284cf38 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -17,6 +17,7 @@
 {% include "InvenTree/settings/user.html" %}
 {% include "InvenTree/settings/user_settings.html" %}
 {% include "InvenTree/settings/user_homepage.html" %}
+{% include "InvenTree/settings/user_search.html" %}
 
 {% if user.is_staff %}
 
diff --git a/InvenTree/templates/InvenTree/settings/user_search.html b/InvenTree/templates/InvenTree/settings/user_search.html
new file mode 100644
index 0000000000..c06bfaec8d
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/user_search.html
@@ -0,0 +1,23 @@
+{% extends "panel.html" %}
+
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block label %}user-search{% endblock %}
+
+{% block heading %}
+{% trans "Search Settings" %}
+{% endblock %}
+
+{% block content %}
+
+<div class='row'>
+    <table class='table table-striped table-condensed'>
+        {% include "InvenTree/settings/header.html" %}
+        <tbody>
+            {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_RESULTS" user_setting=True icon='fa-search' %}
+        </tbody>
+    </table>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/js/inventree.js b/InvenTree/templates/js/inventree.js
index f1e9472910..7ea353c626 100644
--- a/InvenTree/templates/js/inventree.js
+++ b/InvenTree/templates/js/inventree.js
@@ -91,7 +91,7 @@ function inventreeDocReady() {
                 url: '/api/part/',
                 data: {
                     search: request.term,
-                    limit: {% settings_value 'SEARCH_PREVIEW_RESULTS' %},
+                    limit: {% settings_value 'SEARCH_PREVIEW_RESULTS' user=request.user %},
                     offset: 0
                 },
                 success: function (data) {