diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index 9c7c90ac26..c93e26e363 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -11,11 +11,11 @@
 
 {% if parts|length > 0 %}
 <div class='alert alert-info alert-block' role='alert'>
-    {% trans "Select suppliers." %}
+    {% trans "Select suppliers" %}
 </div>
 {% else %}
 <div class='alert alert-warning alert-block' role='alert'>
-    {% trans "No purchaseable parts selected." %}
+    {% trans "No purchaseable parts selected" %}
 </div>
 {% endif %}
 
@@ -39,8 +39,8 @@
                 {{ part.full_name }} <small><i>{{ part.description }}</i></small>
             </td>
             <td>
-                <button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' title='Create new supplier part for {{ part }}' type='button'>
-                    <span part-id='{{ part.id }}' class='fas fa-plus-circle'></span>
+                <button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' part='{{ part.pk }}' title='{% trans "Create new supplier part" $}' type='button'>
+                    <span part='{{ part.pk }}' class='fas fa-plus-circle'></span>
                 </button>
             </td>
             <td>
diff --git a/InvenTree/templates/js/order.js b/InvenTree/templates/js/order.js
index 41a1b4c046..69d4f584d9 100644
--- a/InvenTree/templates/js/order.js
+++ b/InvenTree/templates/js/order.js
@@ -21,9 +21,16 @@ function newSupplierPartFromOrderWizard(e) {
 
     e = e || window.event;
 
-    var src = e.target || e.srcElement;
+    var src = e.srcElement || e.target;
 
-    var part = $(src).attr('part-id');
+    var part = $(src).attr('part');
+
+    console.log('part: ' + part);
+
+    if (!part) {
+        part = $(src).closest('button').attr('part');
+        console.log('parent: ' + part);
+    }
 
     launchModalForm("/supplier-part/new/", {
         modal: '#modal-form-secondary',
@@ -125,7 +132,7 @@ function loadPurchaseOrderTable(table, options) {
         name: 'purchaseorder',
         groupBy: false,
         original: options.params,
-        formatNoMatches: function() { return "{% trans "No purchase orders found" %}"; },
+        formatNoMatches: function() { return '{% trans "No purchase orders found" %}'; },
         columns: [
             {
                 field: 'pk',
@@ -208,7 +215,7 @@ function loadSalesOrderTable(table, options) {
         name: 'salesorder',
         groupBy: false,
         original: options.params,
-        formatNoMatches: function() { return "{% trans "No sales orders found" %}"; },
+        formatNoMatches: function() { return '{% trans "No sales orders found" %}'; },
         columns: [
             {
                 field: 'pk',
@@ -265,7 +272,7 @@ function loadSalesOrderTable(table, options) {
             {
                 sortable: true,
                 field: 'shipment_date',
-                title: "{% trans "Shipment Date" %}",
+                title: '{% trans "Shipment Date" %}',
             },
             {
                 sortable: true,