diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html
index b9042d22b5..19f653cfa8 100644
--- a/InvenTree/templates/InvenTree/search.html
+++ b/InvenTree/templates/InvenTree/search.html
@@ -2,14 +2,58 @@
 
 {% block content %}
 
-<h3>InvenTree Search</h3>
+<h3>Search Results</h3>
 
-<p>
-    Searched for: {{ query }}
-</p>
+{% include "search_form.html" with query_text=query %}
+
+<br><br>
+<h3>Parts <span id='part-result-count'></span></h3>
+<table class='table table-striped table-condensed' data-toolbar="#button-toolbar" id='part-results-table'>
+</table>
 
 {% endblock %}
 
+{% block js_ready %}
+{{ block.super }}
+
+    $("#part-results-table").on('load-success.bs.table', function() {
+        var n = $("#part-results-table").bootstrapTable('getData').length;
+        $("#part-result-count").html("(found " + n + " results)");
+    });
+    
+    $("#part-results-table").bootstrapTable({
+        sortable: true,
+        search: true,
+        pagination: true,
+        queryParams: function(p) {
+            return {
+                search: "{{ query }}",
+            }
+        },
+        columns: [
+            {
+                field: 'pk',
+                title: 'ID',
+                visible: false,
+            },
+            {
+                field: 'name',
+                title: 'Name',
+                sortable: true,
+                searchable: true,
+                formatter: function(value, row, index, field) {
+                    return renderLink(value, row.url);
+                }
+            },
+            {
+                field: 'description',
+                title: 'Description',
+                searchable: true,
+            }
+        ],
+        url: "{% url 'api-part-list' %}"
+    });
+
+
 
-{% block js_load %}
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index 31e0d4de9b..64bb7ec34c 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -12,13 +12,7 @@
       <li><a href="{% url 'company-index' %}">Companies</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">
-        <form class="navbar-form navbar-left" action="{% url 'search' %}" method='post'>
-            {% csrf_token %}
-            <div class="form-group">
-                <input type="text" name='search' class="form-control" placeholder="Search">
-            </div>
-            <button type="submit" id='search-submit' class="btn btn-default">Submit</button>
-        </form>
+        {% include "search_form.html" %}
     {% if user.is_authenticated %}
       <li class='dropdown'>
           <a class='dropdown-toggle' data-toggle='dropdown' href="#"><span class="glyphicon glyphicon-user"></span> <b>{{ user.get_username }}</b></a>
diff --git a/InvenTree/templates/search_form.html b/InvenTree/templates/search_form.html
new file mode 100644
index 0000000000..328fc7ff99
--- /dev/null
+++ b/InvenTree/templates/search_form.html
@@ -0,0 +1,9 @@
+<div>
+<form class="navbar-form navbar-left" action="{% url 'search' %}" method='post'>
+    {% csrf_token %}
+    <div class="form-group">
+        <input type="text" name='search' class="form-control" placeholder="Search"{% if query_text %} value="{{ query }}"{% endif %}>
+    </div>
+    <button type="submit" id='search-submit' class="btn btn-default">Submit</button>
+</form>
+</div>
\ No newline at end of file