diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
index 31d4b4e8fb..f5c8b286ef 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
@@ -379,8 +379,8 @@ public class VPAttribute extends JComponent
 		Integer oldValue = (Integer)getValue ();
 		int oldValueInt = oldValue == null ? 0 : oldValue.intValue ();
 		int M_AttributeSetInstance_ID = oldValueInt;
-		int M_Product_ID = Env.getContextAsInt (Env.getCtx (), m_WindowNo, "M_Product_ID");
-		int M_ProductBOM_ID = Env.getContextAsInt (Env.getCtx (), m_WindowNo, "M_ProductBOM_ID");
+		int M_Product_ID = Env.getContextAsInt (Env.getCtx (), m_WindowNo, m_GridTab.getTabNo(), "M_Product_ID");
+		int M_ProductBOM_ID = Env.getContextAsInt (Env.getCtx (), m_WindowNo, m_GridTab.getTabNo(), "M_ProductBOM_ID");
 		int M_Locator_ID = -1;
 
 		log.config("M_Product_ID=" + M_Product_ID + "/" + M_ProductBOM_ID