diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
index d5e164a7e2..e34b452754 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -911,6 +911,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 		getComponent().getParent().appendChild(win);
 		showBusyMask(win);		
 		LayoutUtils.openOverlappedWindow(getComponent(), win, "middle_center");
+		win.focus();
 	}
 
     public void onChat()
@@ -2607,7 +2608,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 		if (mask != null && mask.getParent() != null) {
 			mask.detach();
 			StringBuilder script = new StringBuilder("var w=zk.Widget.$('#");
-			script.append(getComponent().getParent().getUuid()).append("');w.busy=false;");
+			script.append(getComponent().getParent().getUuid()).append("');if(w) w.busy=false;");
 			Clients.response(new AuScript(script.toString()));
 		}
 	}
diff --git a/org.adempiere.ui.zk/js/window.js b/org.adempiere.ui.zk/js/window.js
index b6bc23dd7c..0656924ddc 100644
--- a/org.adempiere.ui.zk/js/window.js
+++ b/org.adempiere.ui.zk/js/window.js
@@ -13,11 +13,12 @@ zk.override(zk.Widget.prototype, "canActivate",
 	    	}
 			var wgt = this;
 			while (wgt) {
-				if (wgt.busy) {
+				if (wgt.busy) {					
 					if (wgt.busy.className == 'zul.wnd.Window') {
 						if (zUtl.isAncestor(wgt.busy, this)) {
 							return true;
 						} else {
+							jq.focusOut();
 							wgt.busy.focus(0);
 							return false;
 						}