diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
index 870f954283..09e247ca58 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
@@ -335,8 +335,20 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 	    				cmbSearch.setText(null);
 	            	return;
 	            }
-		            
-	            selectTreeitem(value);
+
+	            for(Component comp : cmbSearch.getChildren())
+        		{
+	            	Comboitem item = (Comboitem) comp;
+	            	if (item.getLabel().equals(value))
+	            	{
+	    				String type = item.getContent();
+	    				if (!Util.isEmpty(type))
+	    					selectTreeitem(value+"."+type);
+	    				else
+	    					selectTreeitem(value);
+	    				return;
+					}
+        		}
         	} 
         } 
         else if (event.getName().equals(ON_POST_FIRE_TREE_EVENT))