diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
index 301a64f380..9032653742 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
@@ -213,14 +213,16 @@ public class WChosenboxSearchEditor extends WEditor implements ContextMenuListen
 		if (lookup instanceof MLookup) 
 		{
 			MLookup mlookup = (MLookup) lookup;
-			if ("C_BPartner_ID".equals(mlookup.getLookupInfo().KeyColumn))
+			if ("C_BPartner_ID".equals(mlookup.getLookupInfo().KeyColumn)
+				|| (mlookup.getLookupInfo().KeyColumn != null && mlookup.getLookupInfo().KeyColumn.endsWith(".C_BPartner_ID")))
 			{
 				if (ThemeManager.isUseFontIconForImage())
 					imageUrl = "z-icon-BPartner";
 				else
 					imageUrl = ThemeManager.getThemeResource("images/BPartner16.png");
 			}
-			else if ("M_Product_ID".equals(mlookup.getLookupInfo().KeyColumn))
+			else if ("M_Product_ID".equals(mlookup.getLookupInfo().KeyColumn)
+					|| (mlookup.getLookupInfo().KeyColumn != null && mlookup.getLookupInfo().KeyColumn.endsWith(".M_Product_ID")))
 			{
 				if (ThemeManager.isUseFontIconForImage())
 					imageUrl = "z-icon-Product";