diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 926293a6cc3..f43a39535b8 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -303,12 +303,14 @@ frappe.ui.form.on("BOM", {
 			});
 		}
 
-		fields.push({
-			fieldtype: "Check",
-			label: __("Use Multi-Level BOM"),
-			fieldname: "use_multi_level_bom",
-			default: 1,
-		});
+		if (!skip_qty_field) {
+			fields.push({
+				fieldtype: "Check",
+				label: __("Use Multi-Level BOM"),
+				fieldname: "use_multi_level_bom",
+				default: 1,
+			});
+		}
 
 		if (!skip_qty_field) {
 			fields.push({
@@ -354,6 +356,13 @@ frappe.ui.form.on("BOM", {
 						fieldtype: "Link",
 						in_list_view: 1,
 						reqd: 1,
+						get_query() {
+							return {
+								filters: {
+									has_variants: 1,
+								},
+							};
+						},
 					},
 					{
 						fieldname: "variant_item_code",
@@ -374,6 +383,13 @@ frappe.ui.form.on("BOM", {
 								},
 							};
 						},
+						change() {
+							let doc = this.doc;
+							if (!doc.qty) {
+								doc.qty = 1.0;
+								this.grid.set_value("qty", 1.0, doc);
+							}
+						},
 					},
 					{
 						fieldname: "qty",
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 40fe37afa3c..7b5d796e50d 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -1399,7 +1399,9 @@ def add_variant_item(variant_items, wo_doc, bom_no, table_name="items"):
 		args["amount"] = flt(args.get("required_qty")) * flt(args.get("rate"))
 		args["uom"] = item_data.stock_uom
 
-		existing_row = get_template_rm_item(wo_doc, item.get("item_code"))
+		existing_row = (
+			get_template_rm_item(wo_doc, item.get("item_code")) if table_name == "required_items" else None
+		)
 		if existing_row:
 			existing_row.update(args)
 		else: