diff --git a/client/src/org/compiere/grid/ed/VEditorFactory.java b/client/src/org/compiere/grid/ed/VEditorFactory.java
index fa57200735..75e71edaac 100644
--- a/client/src/org/compiere/grid/ed/VEditorFactory.java
+++ b/client/src/org/compiere/grid/ed/VEditorFactory.java
@@ -206,8 +206,12 @@ public class VEditorFactory
 		//	Account
 		else if (displayType == DisplayType.Account)
 		{
+			//hengsin: bug [ 1711795 ] Combination copied itself in Grid mode
+			/*
 			VAccount acct = new VAccount (columnName, mandatory, readOnly, updateable,
-				(MAccountLookup)mField.getLookup(), mField.getHeader());
+				(MAccountLookup)mField.getLookup(), mField.getHeader());*/
+			VAccount acct = new VAccount (columnName, mandatory, readOnly, updateable,
+					new MAccountLookup (mField.getVO().ctx, mField.getWindowNo()), mField.getHeader());
 			acct.setName(columnName);
 			acct.setField (mField);
 			editor = acct;