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 ea38b7dbdc..d61389e870 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
@@ -2156,11 +2156,15 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
     	if (dirtyTabpanel != null) {
     		focusToTabpanel(dirtyTabpanel);
     		//ensure row indicator is not lost
-    		RowRenderer<Object[]> renderer = dirtyTabpanel.getGridView().getListbox().getRowRenderer();
-    		GridTabRowRenderer gtr = (GridTabRowRenderer)renderer;
-    		org.zkoss.zul.Row row = gtr.getCurrentRow();
-    		if (row != null)
-    			gtr.setCurrentRow(row);
+    		if (dirtyTabpanel.getGridView() != null && 
+    				dirtyTabpanel.getGridView().getListbox() != null &&
+    				dirtyTabpanel.getGridView().getListbox().getRowRenderer() != null) {
+        		RowRenderer<Object[]> renderer = dirtyTabpanel.getGridView().getListbox().getRowRenderer();
+        		GridTabRowRenderer gtr = (GridTabRowRenderer)renderer;
+        		org.zkoss.zul.Row row = gtr.getCurrentRow();
+        		if (row != null)
+        			gtr.setCurrentRow(row);    			
+    		}
     	}
     	else
     		focusToActivePanel();