diff --git a/demo/showcase/table.py b/demo/showcase/table.py
index 2ffeb75a..cb32e6ec 100755
--- a/demo/showcase/table.py
+++ b/demo/showcase/table.py
@@ -60,8 +60,8 @@ def demoTTkTable(root= None):
     dataList = [
         [f"0x{i:04X}"] +
         [int(i*100), float(i*100), ttk.TTkString(getUtfWord(),ttk.TTkColor.YELLOW)] +
-        [random_date(datetime.date(2020,1,1), datetime.date(2025,12,31))] +
         [random_time()] +
+        [random_date(datetime.date(2020,1,1), datetime.date(2025,12,31))] +
         [random_datetime(datetime.datetime(2020,1,1), datetime.datetime(2025,12,31))] +
         [getUtfWord() for _ in range(10)]
         for i in range(101)
diff --git a/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/table_edit_proxy.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/table_edit_proxy.py
index 4e579f35..e3a48fa9 100644
--- a/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/table_edit_proxy.py
+++ b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/table_edit_proxy.py
@@ -438,12 +438,7 @@ class _DateTime_TimeProxy(TTkTime, TTkTableProxyEditWidget, _DateTime_KeyGeneric
         :return: True if event was handled, False otherwise
         :rtype: bool
         '''
-        if (evt.type == TTkK.SpecialKey):
-            if evt.mod == TTkK.NoModifier:
-                if evt.key == TTkK.Key_Enter:
-                    self.leavingTriggered.emit(TTkTableEditLeaving.RIGHT)
-                    return True
-        return super().keyEvent(evt)
+        return self.newKeyEvent(evt,super().keyEvent)
 
 
 class _DateTime_DateProxy(TTkDate, TTkTableProxyEditWidget, _DateTime_KeyGeneric):
@@ -509,12 +504,8 @@ class _DateTime_DateProxy(TTkDate, TTkTableProxyEditWidget, _DateTime_KeyGeneric
         :return: True if event was handled, False otherwise
         :rtype: bool
         '''
-        if (evt.type == TTkK.SpecialKey):
-            if evt.mod == TTkK.NoModifier:
-                if evt.key == TTkK.Key_Enter:
-                    self.leavingTriggered.emit(TTkTableEditLeaving.RIGHT)
-                    return True
-        return super().keyEvent(evt)
+        return self.newKeyEvent(evt,super().keyEvent)
+
 
 class _DateTime_DateTimeProxy(TTkDateTime, TTkTableProxyEditWidget):
     ''' DateTime editor for table cells