diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
index 225fab1fce..f9895a5fde 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
@@ -150,6 +150,8 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
 			}
 
 		};
+		
+		m_WindowNo = form.getWindowNo();
 	}
 	
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
index 7e26cd357d..39d477556c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
@@ -178,6 +178,7 @@ public class WCharge extends Charge implements IFormController, EventListener<Ev
     public WCharge()
     {
         super();
+        m_WindowNo = form.getWindowNo();
         initForm();
     }
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
index 267379fe1e..5f48268f08 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
@@ -84,6 +84,7 @@ public class WMatch extends Match
 	 */
 	public WMatch()
 	{
+		m_WindowNo = form.getWindowNo();
 		log.info("WinNo=" + m_WindowNo
 			+ " - AD_Client_ID=" + m_AD_Client_ID + ", AD_Org_ID=" + m_AD_Org_ID + ", By=" + m_by);
 		Env.setContext(Env.getCtx(), m_WindowNo, "IsSOTrx", "N");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
index a2d53fd030..9f23b9eb62 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
@@ -86,6 +86,9 @@ public class WMerge extends Merge implements IFormController, EventListener<Even
 	 */
 	public WMerge()
 	{
+		form = new WMergeUI(this);
+		m_WindowNo = form.getWindowNo();
+		
 		log.info( "VMerge.init - WinNo=" + m_WindowNo);
 		try
 		{
@@ -148,7 +151,6 @@ public class WMerge extends Merge implements IFormController, EventListener<Even
 	 */
 	void zkInit () throws Exception
 	{
-		form = new WMergeUI(this);		
 		form.appendChild (mainLayout);
 		mainLayout.setHeight("100%");
 		mainLayout.setWidth("100%");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
index 85fe2d0039..567a58f341 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
@@ -86,6 +86,8 @@ public class WPayPrint extends PayPrint implements IFormController, EventListene
 	{
 		try
 		{
+			m_WindowNo = form.getWindowNo();
+			
 			dynInit();
 			zkInit();
 			Borderlayout contentLayout = new Borderlayout();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
index 82e7a2aeed..c35deb6da9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
@@ -119,6 +119,8 @@ public class WPaySelect extends PaySelect
 	{
 		try
 		{
+			m_WindowNo = form.getWindowNo();
+			
 			zkInit();
 			dynInit();
 			
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
index 35020df4c9..ab008bf2fd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
@@ -101,6 +101,7 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener<
 	
 	public WTreeBOM(){
 		try{
+			m_WindowNo = m_frame.getWindowNo();
 			preInit();
 			jbInit ();
 		}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
index f445bd757f..3c9e349215 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
@@ -93,6 +93,7 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController
 	{
 		try
 		{
+			m_WindowNo = form.getWindowNo();
 			preInit();
 			jbInit ();
 			action_loadTree();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
index d0bdef7e4b..cd2a7426ab 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
@@ -106,6 +106,7 @@ public class WTrxMaterial extends TrxMaterial
 		log.info("");
 		try
 		{
+			m_WindowNo = form.getWindowNo();
 			dynParameter();
 			zkInit();
 			dynInit();			
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
index e634f2e438..166dd79e1c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
@@ -33,8 +33,11 @@ import java.util.Vector;
 import java.util.logging.Level;
 
 import org.adempiere.webui.AdempiereWebUI;
+import org.adempiere.webui.adwindow.ADWindow;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.apps.BusyDialog;
+import org.adempiere.webui.apps.ProcessDialog;
+import org.adempiere.webui.apps.wf.WFPanel;
 import org.adempiere.webui.component.ConfirmPanel;
 import org.adempiere.webui.component.ListModelTable;
 import org.adempiere.webui.component.WListItemRenderer;
@@ -49,6 +52,7 @@ import org.adempiere.webui.factory.InfoManager;
 import org.adempiere.webui.part.ITabOnSelectHandler;
 import org.adempiere.webui.part.WindowContainer;
 import org.adempiere.webui.session.SessionManager;
+import org.adempiere.webui.window.WTask;
 import org.compiere.minigrid.ColumnInfo;
 import org.compiere.minigrid.IDColumn;
 import org.compiere.model.I_A_Asset;
@@ -71,15 +75,18 @@ import org.compiere.util.KeyNamePair;
 import org.compiere.util.Msg;
 import org.compiere.util.ValueNamePair;
 import org.zkoss.zk.au.out.AuEcho;
+import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Page;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Clients;
+import org.zkoss.zul.Anchorlayout;
 import org.zkoss.zul.Listhead;
 import org.zkoss.zul.Listheader;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Paging;
+import org.zkoss.zul.Vlayout;
 import org.zkoss.zul.event.ZulEvents;
 import org.zkoss.zul.ext.Sortable;
 
@@ -1317,7 +1324,35 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
         if (Window.MODE_EMBEDDED.equals(getAttribute(Window.MODE_KEY)))
         	SessionManager.getAppDesktop().closeActiveWindow();
         else
+        {
+        	if (getWindowNo() > 0)
+        	{
+        		Object window = SessionManager.getAppDesktop().findWindow(getWindowNo());
+        		Component component = null;
+        		if (window instanceof ADWindow)
+        		{
+        			ADWindow w = (ADWindow) window;
+        			component = w.getADWindowContent().getComponent();
+        		}
+        		else if (window instanceof ADForm || window instanceof ProcessDialog || window instanceof InfoPanel 
+        				|| window instanceof WFPanel || window instanceof WTask)
+        		{
+        			component = (Component) window;
+        		}
+        		
+        		if (component != null && 
+        				(component instanceof Vlayout || component instanceof ADForm || component instanceof ProcessDialog
+						|| component instanceof InfoPanel || component instanceof Anchorlayout 
+						|| component instanceof WFPanel || component instanceof WTask))
+        			Events.sendEvent(new Event(WindowContainer.ON_WINDOW_CONTAINER_SELECTION_CHANGED_EVENT, component));
+        		else
+					SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Home, 0);
+        	}
+        	else
+        		SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Home, 0);
+        	
 	        this.detach();
+        }
     }   //  dispose
 
 	public void sort(Comparator<Object> cmpr, boolean ascending) {