diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.js b/erpnext/manufacturing/page/bom_browser/bom_browser.js
index 453d8c5..3c13905 100644
--- a/erpnext/manufacturing/page/bom_browser/bom_browser.js
+++ b/erpnext/manufacturing/page/bom_browser/bom_browser.js
@@ -60,7 +60,6 @@
 					frappe.boot.user.in_create.indexOf("BOM") !== -1;
 		me.can_write = frappe.model.can_write("BOM");
 		me.can_delete = frappe.model.can_delete("BOM");
-
 		this.tree = new frappe.ui.Tree({
 			parent: $(parent),
 			label: me.bom,
@@ -74,15 +73,15 @@
 						return node.expandable;
 					},
 					click: function(node) {
-						frappe.set_route("Form", "BOM", node.data.parent);
+						frappe.set_route("Form", "BOM", node.data.value);
 					}
 				}
 			],
 			get_label: function(node) {
 				if(node.data.qty) {
-					return node.data.qty + " x " + node.data.value;
+					return node.data.qty + " x " + node.data.item_code;
 				} else {
-					return node.data.value;
+					return node.data.item_code || node.data.value;
 				}
 			}
 		});
diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.py b/erpnext/manufacturing/page/bom_browser/bom_browser.py
index 8051e69..8099389 100644
--- a/erpnext/manufacturing/page/bom_browser/bom_browser.py
+++ b/erpnext/manufacturing/page/bom_browser/bom_browser.py
@@ -6,8 +6,8 @@
 
 @frappe.whitelist()
 def get_children(parent):
-	return frappe.db.sql("""select item_code as value,
-		bom_no as parent, qty,
+	return frappe.db.sql("""select item_code,
+		bom_no as value, qty,
 		if(ifnull(bom_no, "")!="", 1, 0) as expandable
 		from `tabBOM Item`
 		where parent=%s