diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java
index 16816d7249..9487694679 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java
@@ -249,7 +249,7 @@ public class ADWindow extends AbstractUIPart
 	 * @return adwindow instance if found, null otherwise
 	 */
 	public static ADWindow findADWindow(Component comp) {
-		Component parent = comp.getParent();
+		Component parent = comp;
 		while(parent != null) {
 			if (parent.getAttribute(AD_WINDOW_ATTRIBUTE_KEY) != null) {
 				ADWindow adwindow = (ADWindow) parent.getAttribute(AD_WINDOW_ATTRIBUTE_KEY);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
index 0b5b6a997d..9f6cc44898 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
@@ -671,6 +671,14 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
 	public void updateHelpContext(String ctxType, int recordId) {
 		Clients.response(new AuScript("zWatch.fire('onFieldTooltip', this);"));
 		helpController.renderCtxHelp(ctxType, recordId);
+		
+		GridTab gridTab = null;
+		Component window = getActiveWindow();
+		ADWindow adwindow = ADWindow.findADWindow(window);
+		if (adwindow != null) {
+			gridTab = adwindow.getADWindowContent().getActiveGridTab();
+		}
+		updateHelpQuickInfo(gridTab);
 	}
 
 	@Override