diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
index b8329f03e4..1db172a23c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
@@ -887,6 +887,10 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 	}
 
 
+	public boolean isShowingDialog (){
+		return infoPanel != null;
+	}
+	
 	/**
 	 * @param windowNo
 	 * @return WSearchEditor
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
index 7dd425fa5e..2389ffc1d1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
@@ -38,6 +38,7 @@ import org.adempiere.webui.component.Tabpanels;
 import org.adempiere.webui.component.Tabs;
 import org.adempiere.webui.component.WListbox;
 import org.adempiere.webui.editor.WEditor;
+import org.adempiere.webui.editor.WSearchEditor;
 import org.adempiere.webui.editor.WTableDirEditor;
 import org.adempiere.webui.editor.WebEditorFactory;
 import org.adempiere.webui.event.ValueChangeEvent;
@@ -85,7 +86,6 @@ import org.zkoss.zul.North;
 import org.zkoss.zul.Separator;
 import org.zkoss.zul.South;
 import org.zkoss.zul.Space;
-import org.zkoss.zul.Textbox;
 import org.zkoss.zul.Vbox;
 
 /**
@@ -1489,6 +1489,12 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
     				editorComponent = ((EditorBox)editorComponent).getTextbox();
     			}
     			if (editorComponent.equals(tagetComponent)){
+    				// IDEMPIERE-2136
+        			if (editor instanceof WSearchEditor){
+        				if (((WSearchEditor)editor).isShowingDialog()){
+    						return;
+    					}
+        			}
     				isCacheEvent = true;
     				break;
     			}