diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
index 91b0926777..eeb8112bbe 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
@@ -55,6 +55,8 @@ public class AdempiereIdGenerator implements IdGenerator {
 			i = 1;
 		}
 		desktop.setAttribute(DESKTOP_ID_ATTRIBUTE, String.valueOf(i));
+		if (!prefix.endsWith("_"))
+			prefix = prefix + "_";
 		return prefix + i;
 	}