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 6dc1fafce8..2d85d5548b 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
@@ -1571,6 +1571,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
         	findWindow.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
 				@Override
 				public void onEvent(Event event) throws Exception {
+					Clients.clearBusy(getComponent());
 					if (!findWindow.isCancel())
 			        {
 				        MQuery query = findWindow.getQuery();
@@ -1597,7 +1598,9 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 			});
         }
         findWindow.setTitle(null);
-        LayoutUtils.openPopupWindow(toolbar, findWindow, "after_start");
+        getComponent().getParent().appendChild(findWindow);
+        Clients.showBusy(getComponent(), " ");
+        LayoutUtils.openOverlappedWindow(toolbar, findWindow, "after_start");
 	}
 
     /**