diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html
index 67902dc6f6..250c595476 100644
--- a/InvenTree/company/templates/company/supplier_part.html
+++ b/InvenTree/company/templates/company/supplier_part.html
@@ -165,7 +165,8 @@ src="{% static 'img/blank_image.png' %}"
     </div>
     <div class='panel-content'>
         <div id='button-bar'>
-            <div class='btn-group'>
+            <div class='btn-group' role='group'>
+                {% include "filter_list.html" with id='purchaseorder' %}
             </div>
         </div>
         <table class='table table-striped table-condensed po-table' id='purchase-order-table' data-toolbar='#button-bar'>
@@ -326,14 +327,19 @@ $("#item-create").click(function() {
 });
 
 $('#order-part, #order-part2').click(function() {
-    launchModalForm(
-        "{% url 'order-parts' %}",
+
+    inventreeGet(
+        '{% url "api-part-detail" part.part.pk %}', {},
         {
-            data: {
-                part: {{ part.part.id }},
-            },
-            reload: true,
-        },
+            success: function(response) {
+                orderParts([response], {
+                    supplier_part: {{ part.pk }},
+                    {% if part.supplier %}
+                    supplier: {{ part.supplier.pk }},
+                    {% endif %}
+                });
+            }
+        }
     );
 });
 
diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js
index 214a6fa885..9b8366a5aa 100644
--- a/InvenTree/templates/js/translated/order.js
+++ b/InvenTree/templates/js/translated/order.js
@@ -681,6 +681,7 @@ function orderParts(parts_list, options={}) {
                     required: true,
                     type: 'related field',
                     auto_fill: true,
+                    value: options.supplier_part,
                     filters: supplier_part_filters,
                     noResults: function(query) {
                         return '{% trans "No matching supplier parts" %}';
@@ -695,6 +696,7 @@ function orderParts(parts_list, options={}) {
                     required: true,
                     type: 'related field',
                     auto_fill: false,
+                    value: options.order,
                     filters: order_filters,
                     noResults: function(query) {
                         return '{% trans "No matching purchase orders" %}';