diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
index 9937b58b1c..0d47749945 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
@@ -630,8 +630,9 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 
 		//desktop cleanup
 		IDesktop appDesktop = getAppDeskop();
+		HttpSession session = httpRequest.getSession();
 		if (appDesktop != null)
-			appDesktop.logout(T -> {if (T) asyncChangeRole(httpRequest.getSession(), locale, properties);});
+			appDesktop.logout(T -> {if (T) asyncChangeRole(session, locale, properties);});
 	}
 	
 	private void asyncChangeRole(HttpSession httpSession, Locale locale, Properties properties) {
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 9d9aa150de..01ab030566 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
@@ -823,6 +823,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
 	    		((Tab)tabs.get( i )).close();
 	    	}
 	    	AEnv.detachInputElement(layout);
+	    	layout.setVisible(false);
 	    	//schedule async logout
 			Executions.schedule(layout.getDesktop(), e -> asyncLogout(callback), new Event("onAsyncLogout"));
 		} else {