diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index b35a0f1b5a..21d01d7501 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -50,8 +50,23 @@
 <table class='table table-striped table-condensed' data-toolbar="#button-toolbar" id='bom-table'>
 </table>
 
+<table class='table table-striped table-condensed' id='test-table'></table>
+
 {% endblock %}
 
+{% block js_load %}
+{{ block.super }}
+
+<!-- jquery-treegrid -->
+<script type='text/javascript' src='{% static "treegrid/js/jquery.treegrid.js" %}'></script>
+<script type='text/javascript' src='{% static "treegrid/js/jquery.treegrid.bootstrap3.js" %}'></script>
+
+<!-- boostrap-table-treegrid -->
+<script type='text/javascript' src='{% static "bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js" %}'></script>
+
+{% endblock %}
+
+
 {% block js_ready %}
 {{ block.super }}
 
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 1c869a8ca4..ca2ab83f36 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -29,6 +29,7 @@
 <meta name="theme-color" content="#ffffff">
 
 <!-- CSS -->
+<link rel='stylesheet' href='{% static "treegrid/css/jquery.treegrid.css" %}'>
 <link rel="stylesheet" href="{% static 'fontawesome/css/brands.css' %}">
 <link rel="stylesheet" href="{% static 'fontawesome/css/solid.css' %}">
 <link rel="stylesheet" href="{% static 'css/bootstrap_3.3.7_css_bootstrap.min.css' %}">
diff --git a/InvenTree/templates/js/bom.html b/InvenTree/templates/js/bom.html
index 518df74d61..1d75124c39 100644
--- a/InvenTree/templates/js/bom.html
+++ b/InvenTree/templates/js/bom.html
@@ -127,11 +127,10 @@ function loadBomTable(table, options) {
         */
     }
 
-
     // Part column
     cols.push(
         {
-            field: 'sub_part_detail.full_name',
+            field: 'sub_part',
             title: '{% trans "Part" %}',
             sortable: true,
             formatter: function(value, row, index, field) {
@@ -150,6 +149,7 @@ function loadBomTable(table, options) {
         }
     );
 
+    
     // Part description
     cols.push(
         {
@@ -236,26 +236,31 @@ function loadBomTable(table, options) {
         cols.push({
             formatter: function(value, row, index, field) {
 
-                var bValidate = "<button title='{% trans "Validate BOM Item" %}' class='bom-validate-button btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-check-circle icon-blue'/></button>";
-                var bValid = "<span title='{% trans "This line has been validated" %}' class='fas fa-check-double icon-green'/>";
+                if (row.part == options.parent_id) {
 
-                var bEdit = "<button title='{% trans "Edit BOM Item" %}' class='bom-edit-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/edit'><span class='fas fa-edit'/></button>";
-                var bDelt = "<button title='{% trans "Delete BOM Item" %}' class='bom-delete-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/delete'><span class='fas fa-trash-alt icon-red'/></button>";
-                
-                var html = "<div class='btn-group' role='group'>";
-                
-                html += bEdit;
-                html += bDelt;
-                
-                if (!row.validated) {
-                    html += bValidate;
+                    var bValidate = "<button title='{% trans "Validate BOM Item" %}' class='bom-validate-button btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-check-circle icon-blue'/></button>";
+                    var bValid = "<span title='{% trans "This line has been validated" %}' class='fas fa-check-double icon-green'/>";
+
+                    var bEdit = "<button title='{% trans "Edit BOM Item" %}' class='bom-edit-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/edit'><span class='fas fa-edit'/></button>";
+                    var bDelt = "<button title='{% trans "Delete BOM Item" %}' class='bom-delete-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/delete'><span class='fas fa-trash-alt icon-red'/></button>";
+                    
+                    var html = "<div class='btn-group' role='group'>";
+                    
+                    html += bEdit;
+                    html += bDelt;
+                    
+                    if (!row.validated) {
+                        html += bValidate;
+                    } else {
+                        html += bValid;
+                    }
+
+                    html += "</div>";
+
+                    return html;
                 } else {
-                    html += bValid;
+                    return '';
                 }
-
-                html += "</div>";
-
-                return html;
             }
         });
     }
@@ -274,8 +279,51 @@ function loadBomTable(table, options) {
     if (options.sub_part_detail) {
         params.sub_part_detail = true;
     }
+
+    function requestBomItems() {
+
+        var data = table.bootstrapTable('getData');
+
+        for (var idx = 0; idx < data.length; idx++) {
+            var row = data[idx];
+
+            if (row.sub_part_detail.assembly && !row.requested) {
+
+                row.requested = true;
+
+                // Mark this row as 'requested' so it doesn't get updated again
+                table.bootstrapTable('updateRow', idx, row, true);
+
+                inventreeGet(
+                    options.bom_url,
+                    {
+                        part: row.sub_part,
+                        sub_part_detail: true,
+                    },
+                    {
+                        success: function(response) {
+
+                            // Add the data to the table
+                            table.bootstrapTable('append', response);
+
+                            // Request any NEW sub BOMs
+                            requestBomItems();
+                        },
+                        error: function() {
+                            console.log('Error requesting BOM for part=' + row.sub_part);
+                        }
+                    }
+                );
+            }
+        }
+    }
     
     table.bootstrapTable({
+        treeEnable: true,
+        rootParentId: options.parent_id,
+        idField: 'sub_part',
+        parentIdField: 'part',
+        treeShowField: 'sub_part',
         sortable: true,
         search: true,
         rowStyle: function(row, index) {
@@ -291,7 +339,15 @@ function loadBomTable(table, options) {
             return params;
         },
         columns: cols,
-        url: options.bom_url
+        url: options.bom_url,
+        onPostBody: function() {
+            table.treegrid({
+                treeColumn: 0,
+                onExpand: function() {
+                }
+            });
+        },
+        onLoadSuccess: requestBomItems,
     });
 
     // In editing mode, attached editables to the appropriate table elements