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 a58743fdab..c94bcb400b 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
@@ -1169,8 +1169,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
 			throw new AdempiereException(Msg.getMsg(Env.getCtx(),"RecordIsNotInCurrentSearch"));
 		}
 
-		//  Navigate to node row
-		gridTab.navigate(row);
+		windowPanel.onTreeNavigate(row);				
 	}
 
     /**
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 2e6ab1c288..1c29c454a3 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
@@ -856,6 +856,23 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 		saveAndNavigate(callback);
     }
 
+    /**
+     * @see ToolbarListener#onPrevious()
+     */
+    public void onTreeNavigate(final int rowIndex)
+    {
+    	Callback<Boolean> callback = new Callback<Boolean>() {
+    		@Override
+    		public void onCallback(Boolean result) {
+    			if (result) {
+    				adTabbox.getSelectedGridTab().navigate(rowIndex);
+    				focusToActivePanel();
+    			}
+    		}
+    	};
+    	saveAndNavigate(callback);
+    }
+
     // Elaine 2008/12/04
 	private Menupopup 	m_popup = null;
 	private Menuitem 	m_lock = null;