diff --git a/client/src/org/compiere/grid/ed/Calendar.java b/client/src/org/compiere/grid/ed/Calendar.java
index 14dd6b7bff..94bf0f15a2 100644
--- a/client/src/org/compiere/grid/ed/Calendar.java
+++ b/client/src/org/compiere/grid/ed/Calendar.java
@@ -706,6 +706,14 @@ public class Calendar extends CDialog
 			dispose();
 			return;
 		}
+		
+		//	ESC = Cancel - teo_sarca, [ 1660164 ]
+		if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
+		{
+			m_cancel = true;
+			dispose();
+			return;
+		}
 
 		//	Modified Hour/Miinute
 		setTime();