diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
index 9f0b6558f4..34a199527d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
@@ -281,8 +281,8 @@ ContextMenuListener, IZoomableEditor
                 //still not in list, reset to zero
                 if (!getComponent().isSelected(value))
                 {
-                	if (value instanceof Integer && gridField != null && gridField.getDisplayType() != DisplayType.ID
-                			&& gridTab != null && !gridTab.getTableModel().isImporting()) // for IDs is ok to be out of the list
+                	if (value instanceof Integer && gridField != null && gridField.getDisplayType() != DisplayType.ID && 
+                			(gridTab==null || !gridTab.getTableModel().isImporting())) // for IDs is ok to be out of the list
                 	{
                 		getComponent().setValue(null);
                 		if (curValue == null)