diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index b0a96c8759..dc1a0e9568 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -685,7 +685,7 @@ class Part(models.Model):
         - Exclude parts which this part is in the BOM for
         """
 
-        parts = Part.objects.filter(component=True)
+        parts = Part.objects.filter(component=True).exclude(id=self.id)
         parts = parts.exclude(id__in=[part.id for part in self.used_in.all()])
 
         return parts
diff --git a/InvenTree/part/templates/part/bom_upload/select_parts.html b/InvenTree/part/templates/part/bom_upload/select_parts.html
index 803f9dc496..8a1a7b17a6 100644
--- a/InvenTree/part/templates/part/bom_upload/select_parts.html
+++ b/InvenTree/part/templates/part/bom_upload/select_parts.html
@@ -47,6 +47,10 @@
                 {% for item in row.data %}
                 <td>
                     {% if item.column.guess == 'Part' %}
+                    <button class='btn btn-default btn-create' id='new_part_row_{{ row.index }}' title='Create new part' type='button'>
+                        <span row_id='{{ row.index }}' class='glyphicon glyphicon-small glyphicon-plus' onClick='newPartFromBomWizard()'/>
+                    </button>
+
                     <select class='select bomselect' id='id_part_{{ row.index }}' name='part_select_{{ row.index }}'>
                         <option value=''>---------</option>
                         {% for part in row.part_options %}
diff --git a/InvenTree/static/script/inventree/bom.js b/InvenTree/static/script/inventree/bom.js
index 8b6e802f72..21368623b4 100644
--- a/InvenTree/static/script/inventree/bom.js
+++ b/InvenTree/static/script/inventree/bom.js
@@ -62,6 +62,21 @@ function removeColFromBomWizard(e) {
 }
 
 
+function newPartFromBomWizard(e) {
+    /* Create a new part directly from the BOM wizard.
+     */
+
+    e = e || window.event;
+
+    var src = e.target || e.srcElement;
+
+    launchModalForm('/part/new/', {
+        success: function() {
+        }
+    });
+}
+
+
 function loadBomTable(table, options) {
     /* Load a BOM table with some configurable options.
      *