diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
index bd4e5acf7c..350750bcf0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
@@ -1311,16 +1311,16 @@ DataStatusListener, IADTabpanel, IdSpace
 		if (this.detailPaneMode != detailPaneMode) {
 			this.detailPaneMode = detailPaneMode;
 			if (detailPaneMode) {
-				hideDetail();
+				detachDetailPane();
 			} else {
-				showDetail();
+				attachDetailPane();
 			}
 			this.setVflex("true");
 			listPanel.setDetailPaneMode(detailPaneMode);
 		}		
 	}
 
-	private void showDetail() {
+	private void attachDetailPane() {
 		if (formContainer.getSouth() != null) {
 			formContainer.getSouth().setVisible(true);
 			if (formContainer.getSouth().isOpen() && detailPane != null && detailPane.getParent() == null) {
@@ -1329,7 +1329,7 @@ DataStatusListener, IADTabpanel, IdSpace
 		}
 	}
 
-	private void hideDetail() {
+	private void detachDetailPane() {
 		if (formContainer.getSouth() != null) {
 			formContainer.getSouth().setVisible(false);
 			if (detailPane != null && detailPane.getParent() != null) {
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 f07d5d2ff6..cb55c2c52f 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
@@ -1065,7 +1065,13 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 					}
 				}
 			};
-			saveAndNavigate(command);
+			Object value = Executions.getCurrent().getAttribute(CompositeADTabbox.AD_TABBOX_ON_EDIT_DETAIL_ATTRIBUTE);
+			if (value != null && value == adTabbox.getSelectedDetailADTabpanel()
+				&& adTabbox.getDirtyADTabpanel() == adTabbox.getSelectedDetailADTabpanel()) {
+				command.onCallback(true);
+			} else {
+				saveAndNavigate(command);
+			}
 		}
 
 	}
@@ -1138,17 +1144,16 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 			}
 		}
 
-//		if (!activated)
-//		{
-			if (!back)
-			{
-			    newTabpanel.query();
-			}
-			else
-			{
-			    newTabpanel.refresh();
-			}
-//		}
+		if (!back)
+		{
+			Object value = Executions.getCurrent().removeAttribute(CompositeADTabbox.AD_TABBOX_ON_EDIT_DETAIL_ATTRIBUTE);
+			if (value != newTabpanel)
+				newTabpanel.query();
+		}
+		else
+		{
+		    newTabpanel.refresh();
+		}
 
 		if (adTabbox.getSelectedTabpanel() instanceof ADSortTab)
 		{
@@ -1536,7 +1541,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 			            
 			            if (adTabbox.getSelectedTabpanel().isGridView())
 			            {
-			            	adTabbox.getSelectedTabpanel().getGridView().editCurrentRow();
+			            	adTabbox.getSelectedTabpanel().getGridView().onEditCurrentRow();
 			            }
 			        }
 			        else
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
index ff3ef4c2ee..32aa03edc6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
@@ -35,6 +35,7 @@ import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.Evaluator;
 import org.compiere.util.Msg;
+import org.zkoss.zk.au.out.AuScript;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Execution;
 import org.zkoss.zk.ui.Executions;
@@ -55,6 +56,8 @@ import org.zkoss.zul.Vlayout;
  */
 public class CompositeADTabbox extends AbstractADTabbox
 {
+	public static final String AD_TABBOX_ON_EDIT_DETAIL_ATTRIBUTE = "ADTabbox.onEditDetail";
+
 	private static final String ON_POST_TAB_SELECTION_CHANGED_EVENT = "onPostTabSelectionChanged";
 
 	public static final String ON_SELECTION_CHANGED_EVENT = "onSelectionChanged";
@@ -90,13 +93,19 @@ public class CompositeADTabbox extends AbstractADTabbox
 							? getSelectedDetailADTabpanel().getGridTab().getCurrentRow()
 							: 0;
 					final boolean formView = event.getData() != null ? (Boolean)event.getData() : true;
-					adWindowPanel.saveAndNavigate(new Callback<Boolean>() {
-						@Override
-						public void onCallback(Boolean result) {
-							if (result)
-								onEditDetail(row, formView);
-						}
-					});					
+					if (getSelectedDetailADTabpanel() != null && 
+						((getSelectedDetailADTabpanel() == getDirtyADTabpanel()) ||
+						(getDirtyADTabpanel() == null && getSelectedDetailADTabpanel().getGridTab().isNew()))) {
+						onEditDetail(row, formView);
+					} else {												
+						adWindowPanel.saveAndNavigate(new Callback<Boolean>() {
+							@Override
+							public void onCallback(Boolean result) {
+								if (result)
+									onEditDetail(row, formView);
+							}
+						});					
+					}
 				}
 				else if (DetailPane.ON_NEW_EVENT.equals(event.getName())) {
 					if (headerTab.getGridTab().isNew()) return;
@@ -114,8 +123,16 @@ public class CompositeADTabbox extends AbstractADTabbox
 										adWindowPanel.onNew();
 								} else {
 									if (!getSelectedDetailADTabpanel().getGridTab().isNew()) {
-										getSelectedDetailADTabpanel().getGridTab().dataNew(false);
-										getSelectedDetailADTabpanel().getGridView().editCurrentRow();
+										getSelectedDetailADTabpanel().getGridTab().dataNew(false);										
+										if (!((ADTabpanel)headerTab).isDetailVisible()) {
+											String uuid = headerTab.getDetailPane().getParent().getUuid();
+											String vid = getSelectedDetailADTabpanel().getGridView().getUuid();
+											String script = "setTimeout(function(){zk('#"+uuid+"').$().setOpen(true);setTimeout(function(){var v=zk('#" + vid
+													+ "').$();var e=new zk.Event(v,'onEditCurrentRow',null,{toServer:true});zAu.send(e);},200);},200)";
+											Clients.response(new AuScript(script));
+										} else {
+											getSelectedDetailADTabpanel().getGridView().onEditCurrentRow();
+										}
 									}
 								}
 							}
@@ -149,11 +166,13 @@ public class CompositeADTabbox extends AbstractADTabbox
     }
     
     protected void onEditDetail(int row, boolean formView) {
+    	
 		int oldIndex = selectedIndex;
 		IADTabpanel selectedPanel = getSelectedDetailADTabpanel();
 		if (selectedPanel == null) return;
 		int newIndex = selectedPanel.getTabNo();
 		
+		Executions.getCurrent().setAttribute(AD_TABBOX_ON_EDIT_DETAIL_ATTRIBUTE, selectedPanel);
 		Event selectionChanged = new Event(ON_SELECTION_CHANGED_EVENT, layout, new Object[]{oldIndex, newIndex});
 		try {
 			selectionListener.onEvent(selectionChanged);
@@ -165,7 +184,15 @@ public class CompositeADTabbox extends AbstractADTabbox
 		if (formView && headerTab.isGridView()) {
 			headerTab.switchRowPresentation();
 		}
+
 		headerTab.getGridTab().setCurrentRow(row, true);
+		if (headerTab.isGridView()) {
+			if (headerTab.getGridTab().isNew() || headerTab.needSave(true, false)) {
+				headerTab.getGridView().onEditCurrentRow();
+			}
+		} else {
+			((HtmlBasedComponent)headerTab).focus();
+		}
 	}
     
     protected Component doCreatePart(Component parent)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
index 87b6cd987f..792bc30f93 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
@@ -821,7 +821,7 @@ public class GridView extends Vbox implements EventListener<Event>, IdSpace
 		return gridField;
 	}
 	
-	public void editCurrentRow() {
+	public void onEditCurrentRow() {
 		if (!renderer.isEditing()) {
 			renderer.editCurrentRow();
 			renderer.setFocusToEditor();