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 2d85d5548b..9f3cf529fa 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
@@ -659,10 +659,13 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 					}
 				});
 	        	findWindow.setTitle(null);
+	        	findWindow.setBorder("none");	
+	        	findWindow.setStyle("padding: 5px;");
 	        	getComponent().addEventListener("onInitialQuery", new EventListener<Event>() {
 					@Override
 					public void onEvent(Event event) throws Exception {
-						LayoutUtils.openPopupWindow(getComponent(), findWindow, "overlap");
+						getComponent().getParent().appendChild(findWindow);
+						LayoutUtils.openOverlappedWindow(getComponent(), findWindow, "overlap");
 					}
 				});
 	        	Events.echoEvent("onInitialQuery", getComponent(), null);
@@ -1559,6 +1562,8 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 	            adTabbox.getSelectedGridTab().getAD_Table_ID(), adTabbox.getSelectedGridTab().getTableName(),
 	            adTabbox.getSelectedGridTab().getWhereExtended(), findFields, 1, adTabbox.getSelectedGridTab().getAD_Tab_ID());
 
+	        findWindow.setBorder("none");	
+        	findWindow.setStyle("padding: 5px;");	        
 	        if (!findWindow.initialize()) {
 	        	if (findWindow.getTotalRecords() == 0) {
 	        		FDialog.info(curWindowNo, getComponent(), "NoRecordsFound");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index dbdab6883a..59284f208c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -542,7 +542,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 
         winMain = new MultiTabPart();
         winMain.createPart(layout);
-        winMain.getComponent().setStyle("width: 100%; position: relative;");
+        winMain.getComponent().setStyle("width: 99%; position: relative; margin-left: auto; margin-right: auto; margin-top: 5px;");
         winMain.getComponent().setVflex("1");
         winMain.getComponent().addEventListener(Events.ON_SELECT, this);
         winAdvanced = new Window();