diff --git a/base/src/org/compiere/model/GridField.java b/base/src/org/compiere/model/GridField.java
index aecbc50ab5..53e4b5f80b 100644
--- a/base/src/org/compiere/model/GridField.java
+++ b/base/src/org/compiere/model/GridField.java
@@ -122,7 +122,9 @@ public class GridField
 			return;
 		log.config("(" + m_vo.ColumnName + ")");
 
-		if (DisplayType.isLookup(m_vo.displayType) && m_vo.IsDisplayed)
+		
+		if (DisplayType.isLookup(m_vo.displayType) && m_vo.IsDisplayed || m_vo.displayType == DisplayType.TableDir && m_vo.IsDisplayed
+				||m_vo.displayType == DisplayType.PAttribute)
 		{
 			if (m_vo.lookupInfo == null)
 			{
@@ -156,11 +158,11 @@ public class GridField
 			MAccountLookup ma = new MAccountLookup (m_vo.ctx, m_vo.WindowNo);
 			m_lookup = ma;
 		}
-		else if (m_vo.displayType == DisplayType.PAttribute)    //  not cached
-		{
-			MPAttributeLookup pa = new MPAttributeLookup (m_vo.ctx, m_vo.WindowNo);
-			m_lookup = pa;
-		}
+		//else if (m_vo.displayType == DisplayType.PAttribute)    //  not cached
+		//{
+		//	MPAttributeLookup pa = new MPAttributeLookup (m_vo.ctx, m_vo.WindowNo);
+		//	m_lookup = pa;
+		//}
 	}   //  m_lookup
 
 	/**
@@ -367,7 +369,6 @@ public class GridField
 			if (!retValue)
 				return false;
 		}
-		
 
 		//  Always editable if Active
 		if (m_vo.ColumnName.equals("Processing")
diff --git a/base/src/org/compiere/model/GridWindow.java b/base/src/org/compiere/model/GridWindow.java
index 38baa2c000..8ebfd1bd92 100644
--- a/base/src/org/compiere/model/GridWindow.java
+++ b/base/src/org/compiere/model/GridWindow.java
@@ -143,8 +143,7 @@ public class GridWindow implements Serializable
 	{
 		GridTab mTab = m_tabs.get(index);
 		if (initTabs.contains(mTab)) return;		
-		mTab.initTab(false);
-		
+		mTab.initTab(false);		
 		//		Set Link Column
 		if (mTab.getLinkColumnName().length() == 0)
 		{
@@ -380,7 +379,7 @@ public class GridWindow implements Serializable
 		else	//	HTML
 		{
 			doc = WebDoc.createPopup (title);
-			doc.addPopupClose();
+			doc.addPopupClose(Env.getCtx());
 		}
 		
 	//	body.addElement("© Adempiere   ");
@@ -494,7 +493,7 @@ public class GridWindow implements Serializable
 		}	//	for all Tabs
 		
 		if (!javaClient)
-			doc.addPopupClose();
+			doc.addPopupClose(Env.getCtx());
 	//	System.out.println(doc.toString());
 		return doc;
 	}	//	getHelpDoc