diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
index 1b074759da..b02dd9dd08 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
@@ -355,7 +355,8 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt, Renderer
 		if (rowIndex == gridTab.getCurrentRow()) {
 			row.setStyle("border-top: 1px solid #6f97d2; border-bottom: 1px solid #6f97d2");
 		}
-		row.addEventListener(Events.ON_CLICK, rowListener);		
+		row.addEventListener(Events.ON_CLICK, rowListener);
+		row.addEventListener(Events.ON_DOUBLE_CLICK, rowListener);
 	}	
 
 	/**
@@ -407,24 +408,29 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt, Renderer
 		WEditor toFocus = null;
 		Label firstLabel = null;
 		for (WEditor editor : getEditors()) {
-			if (editor.isHasFocus()) {
+			if (editor.isHasFocus() && editor.isVisible() && editor.getComponent().getParent() != null) {
 				toFocus = editor;
 				break;
 			}
 			
 			if (toFocus == null) {
-				if (editor.isVisible() && editor.isReadWrite()) {
+				if (editor.isVisible() && editor.isReadWrite() && editor.getComponent().getParent() != null) {
 					toFocus = editor;				
 				}
 			}
 			if (firstLabel == null) {
-				if (editor.getComponent() instanceof Label) {
+				if (editor.getComponent() instanceof Label && editor.getComponent().getParent() != null) {
 					firstLabel = (Label) editor.getComponent();
 				}
 			}
 		}		
-		if (toFocus != null)
-			Clients.response(new AuFocus(toFocus.getComponent()));
+		if (toFocus != null) {
+			Component c = toFocus.getComponent();
+			if (c instanceof EditorBox) {
+				c = ((EditorBox)c).getTextbox();
+			}
+			Clients.response(new AuFocus(c));
+		}
 		else if (firstLabel != null)
 			Clients.response(new AuFocus(firstLabel));
 	}
@@ -450,6 +456,10 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt, Renderer
 				Event evt = new Event(Events.ON_CLICK, _grid, event.getTarget());
 				Events.sendEvent(_grid, evt);
 			}
+			else if (Events.ON_DOUBLE_CLICK.equals(event.getName())) {
+				Event evt = new Event(Events.ON_DOUBLE_CLICK, _grid, _grid);
+				Events.sendEvent(_grid, evt);
+			}
 		}
 		
 	}	
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
index 49cefb0658..f6c5c9f6d1 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
@@ -754,7 +754,7 @@ DataStatusListener, IADTabpanel
      */
     public void onEvent(Event event)
     {
-    	if (event.getTarget() instanceof Listbox) 
+    	if (event.getTarget() == listPanel.getListbox()) 
     	{
     		this.switchRowPresentation();
     	} 
@@ -944,7 +944,6 @@ DataStatusListener, IADTabpanel
 	        {
 	        	activateChild(true, ep);
 	        }
-			
 		}
 		listPanel.setVisible(!formComponent.isVisible());
 		if (listPanel.isVisible()) {