diff --git a/InvenTree/templates/js/translated/bom.js b/InvenTree/templates/js/translated/bom.js
index 4fa178923c..3106c3b9f0 100644
--- a/InvenTree/templates/js/translated/bom.js
+++ b/InvenTree/templates/js/translated/bom.js
@@ -69,13 +69,14 @@ function constructBomUploadTable(data, options={}) {
 
         var buttons = `<div class='btn-group float-right' role='group'>`;
 
-        buttons += makeIconButton('fa-file-alt', 'button-row-data', idx, '{% trans "Display row data" %}');
+        // buttons += makeIconButton('fa-file-alt', 'button-row-data', idx, '{% trans "Display row data" %}');
         buttons += makeIconButton('fa-times icon-red', 'button-row-remove', idx, '{% trans "Remove row" %}');
 
         buttons += `</div>`;
 
         var html = `
         <tr id='bom_import_row_${idx}' class='bom-import-row'>
+            <td id='col_buttons_${idx}'>${buttons}</td>
             <td id='col_sub_part_${idx}'>${sub_part}</td>
             <td id='col_quantity_${idx}'>${quantity}</td>
             <td id='col_reference_${idx}'>${reference}</td>
@@ -84,7 +85,6 @@ function constructBomUploadTable(data, options={}) {
             <td id='col_inherited_${idx}'>${inherited}</td>
             <td id='col_optional_${idx}'>${optional}</td>
             <td id='col_note_${idx}'>${note}</td>
-            <td id='col_buttons_${idx}'>${buttons}</td>
         </tr>`;
 
         $('#bom-import-table tbody').append(html);
@@ -111,6 +111,15 @@ function constructBomUploadTable(data, options={}) {
         $(`#button-row-remove-${idx}`).click(function() {
             $(`#bom_import_row_${idx}`).remove();
         });
+
+        // Add callbacks for the fields which allow it
+        function addRowClearCallback(field_name) {
+            addClearCallback(`${field_name}_${idx}`, fields[field_name]);
+        }
+        
+        addRowClearCallback('reference');
+        addRowClearCallback('overage');
+        addRowClearCallback('note');
     }
 
     // Request API endpoint options
diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js
index dda79f2737..e5cb571a58 100644
--- a/InvenTree/templates/js/translated/forms.js
+++ b/InvenTree/templates/js/translated/forms.js
@@ -1240,8 +1240,14 @@ function addClearCallback(name, field, options) {
 
     var field_name = getFieldName(name, options);
 
-    var el = $(options.modal).find(`#clear_${field_name}`);
-    
+    var el = null;
+
+    if (options && options.modal) {
+        el = $(options.modal).find(`#clear_${field_name}`);
+    } else {
+        el = $(`#clear_${field_name}`);
+    }
+
     if (!el) {
         console.log(`WARNING: addClearCallback could not find field '${name}'`);
         return;