diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
index 1411ddfe9b..8f5c0e42c7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
@@ -204,7 +204,7 @@ public class NumberBox extends Div
         decimalBox.setId(decimalBox.getUuid());
         txtCalc.setId(txtCalc.getUuid());
         
-        txtCalc.setWidgetListener("onKeyPress", "return calc.validate('" + 
+        txtCalc.setWidgetListener("onKeyUp", "return calc.validate('" + 
         		decimalBox.getId() + "','" + txtCalc.getId() 
                 + "'," + integral + "," + (int)separatorChar + ", event);");
         txtCalc.setMaxlength(250);
diff --git a/org.adempiere.ui.zk/js/calc.js b/org.adempiere.ui.zk/js/calc.js
index 9f10380124..2e28aee360 100644
--- a/org.adempiere.ui.zk/js/calc.js
+++ b/org.adempiere.ui.zk/js/calc.js
@@ -18,7 +18,7 @@ function Calc()
 
 	     if(key == 13 || key == 61) // Enter, =
 	     {
-	     	evaluate(displayTextId, calcTextId);
+	     	evaluate(displayTextId, calcTextId, String.fromCharCode(separatorKey));
 	        return false;
 	     }
 	     else if (key == 0) // control, delete, ...