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 19fd912027..e13156836d 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
@@ -1458,6 +1458,8 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
 		    	if (!tabPanel.isGridView()) {
 		    		tabPanel.switchRowPresentation();	
 		    	}	    		    	
+	    	} else if (tabPanel != null && !tabPanel.getGridTab().isCurrent()) {
+	    		tabPanel.activate(true);
 	    	}
 		}