diff --git a/InvenTree/part/templates/part/bom_upload/select_parts.html b/InvenTree/part/templates/part/bom_upload/select_parts.html
index f5851e5d43..53abea8b69 100644
--- a/InvenTree/part/templates/part/bom_upload/select_parts.html
+++ b/InvenTree/part/templates/part/bom_upload/select_parts.html
@@ -62,6 +62,11 @@
                     </button>
 
                     <select class='select bomselect' id='select_part_{{ row.index }}' name='part_{{ row.index }}'>
+                        {% if row.part_match %}
+                            {% with row.part_match as part %}
+                            <option value='{{ part.id }}'{% if part.id == row.part.id %} selected='selected'{% endif %}>{{ part.full_name }} - {{ part.description }}</option>
+                            {% endwith %}  
+                        {% endif %}
                         <option value=''>---------</option>
                         {% for part in row.part_options %}
                         <option value='{{ part.id }}'{% if part.id == row.part.id %} selected='selected'{% endif %}>{{ part.full_name }} - {{ part.description }}</option>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 9ae5cc8026..eb9b667e3f 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -847,6 +847,7 @@ class BomUpload(FormView):
             rows.append({
                 'index': row.get('index', -1),
                 'data': data,
+                'part_match': row.get('part_match', None),
                 'part_options': row.get('part_options', self.allowed_parts),
 
                 # User-input (passed between client and server)
@@ -991,7 +992,16 @@ class BomUpload(FormView):
                 row['notes'] = row['data'][n_idx]
 
             row['quantity'] = quantity
-            row['part_options'] = [m['part'] for m in matches]
+
+            # Part selection: separate match from options
+            match_limit = 100
+            part_matches = [m['part'] for m in matches if m['match'] >= match_limit]
+            if len(part_matches) == 1:
+                row['part_match'] = part_matches[0]
+                row['part_options'] = [m['part'] for m in matches if m['match'] < match_limit]
+            else:
+                row['part_match'] = None
+                row['part_options'] = [m['part'] for m in matches]
 
     def extractDataFromFile(self, bom):
         """ Read data from the BOM file """