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 5920aa9b4e..7dcc696803 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
@@ -284,6 +284,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
         contextHelp.setSclass("window-container-toolbar-btn context-help-btn");
         contextHelp.setStyle("cursor: pointer; border: 1px solid transparent; padding: 2px;");
         contextHelp.setTooltiptext(Util.cleanAmp(Msg.getElement(Env.getCtx(), "AD_CtxHelp_ID")));
+        contextHelp.setVisible(!e.isVisible());
         
         return layout;
     }
@@ -341,6 +342,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
         		layout.getEast().setVisible(true);
         		layout.getEast().setOpen(true);
         		contextHelp.setVisible(false);
+        		updateHelpCollapsedPreference(false);
         	}
         	else if(comp instanceof ToolBarButton)
             {