diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
index 54bae2690f..34f0c871f4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
@@ -828,7 +828,11 @@ public class GridView extends Vbox implements EventListener<Event>, IdSpace, IFi
 			ADWindow adwindow = ADWindow.findADWindow(adtabpanel);
 			if (adwindow != null) {
 				IADTabpanel selectedADTabpanel = adwindow.getADWindowContent().getADTab().getSelectedTabpanel();
-				if (selectedADTabpanel != adtabpanel)
+				IADTabpanel  selectedADDetailTabpanel = null ;
+				if(selectedADTabpanel.getDetailPane() != null)
+					selectedADDetailTabpanel = selectedADTabpanel.getDetailPane().getSelectedADTabpanel();
+				
+				if (selectedADTabpanel != adtabpanel && selectedADDetailTabpanel != null && selectedADDetailTabpanel != adtabpanel)
 					setFocus = false;
 			}
 		}