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 5d7a757b59..23534bd2fb 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
@@ -2413,6 +2413,22 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
             breadCrumb.enableLastNavigation(adTabbox.getSelectedGridTab().getCurrentRow() + 1 < adTabbox.getSelectedGridTab().getRowCount());
             toolbar.enableTabNavigation(false);
             toolbar.enableIgnore(true);
+
+            if (adTabbox.getSelectedGridTab().isSingleRow()) 
+            {
+            	if (adTabbox.getSelectedTabpanel().isGridView())
+            	{
+            		adTabbox.getSelectedTabpanel().switchRowPresentation();
+            	}
+            }
+
+            if (adTabbox.getSelectedTabpanel().isGridView())
+            {
+            	adTabbox.getSelectedTabpanel().getGridView().onEditCurrentRow();
+            }
+
+            focusToActivePanel();
+
             if (postCallback != null)
             	postCallback.onCallback(true);