diff --git a/src/View/BoundaryCondition/BoundaryConditionWindow.py b/src/View/BoundaryCondition/BoundaryConditionWindow.py
index b9f754799f07ae0a11983c0004d7860330463461..9a22cf812de9c352a18ccc38d00b52ffc0df2ca6 100644
--- a/src/View/BoundaryCondition/BoundaryConditionWindow.py
+++ b/src/View/BoundaryCondition/BoundaryConditionWindow.py
@@ -201,6 +201,7 @@ class BoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
         for row in rows:
             win = EditBoundaryConditionWindow(
                 data=self._bcs.get(tab, row),
+                study=self._study,
                 parent=self
             )
             win.show()
diff --git a/src/View/BoundaryCondition/Edit/Table.py b/src/View/BoundaryCondition/Edit/Table.py
index f21539c400506e0bafe099ee7d93d9dcda6c15bf..d41a3551b286428d90b59bfaf6315a4b078a8063 100644
--- a/src/View/BoundaryCondition/Edit/Table.py
+++ b/src/View/BoundaryCondition/Edit/Table.py
@@ -109,10 +109,11 @@ class ExTimeDelegate(QItemDelegate):
 
 
 class TableModel(QAbstractTableModel):
-    def __init__(self, data=None, undo=None):
+    def __init__(self, data=None, mode="time", undo=None):
         super(QAbstractTableModel, self).__init__()
         self._headers = data.header
         self._data = data
+        self._mode = mode
         self._undo = undo
 
     def flags(self, index):
@@ -144,12 +145,13 @@ class TableModel(QAbstractTableModel):
             if self._data.get_type_column(column) == float:
                 value = f"{v:.4f}"
             elif self._data.header[column] == "time":
-                t0 = datetime.fromtimestamp(0)
-                t = datetime.fromtimestamp(v)
-                value = str(t - t0)
-                #value = v
+                if self._mode == "time":
+                    t0 = datetime.fromtimestamp(0)
+                    t = datetime.fromtimestamp(v)
+                    value = str(t - t0)
+                else:
+                    value = str(datetime.fromtimestamp(v))
             else:
-                # TODO: Time format
                 value = f"{v}"
 
         return value
diff --git a/src/View/BoundaryCondition/Edit/Window.py b/src/View/BoundaryCondition/Edit/Window.py
index 9637f7abfda0bfc90e20826f4207e849468172b7..24ec9fcab2fd4315b7cf86c0f16100fc1c60ae9c 100644
--- a/src/View/BoundaryCondition/Edit/Window.py
+++ b/src/View/BoundaryCondition/Edit/Window.py
@@ -27,12 +27,14 @@ from View.BoundaryCondition.Edit.Plot import Plot
 _translate = QCoreApplication.translate
 
 class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
-    def __init__(self, title="Edit BoundaryConditions", data=None, parent=None):
+    def __init__(self, title="Edit BoundaryConditions",
+                 data=None, study=None, parent=None):
         super(EditBoundaryConditionWindow, self).__init__(
             name=title, ui="EditBoundaryConditions", parent=parent
         )
 
         self._data = data
+        self._study = study
         self._title = title
 
         self.setup_window()
@@ -66,14 +68,15 @@ class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
         table = self.find(QTableView, "tableView")
         self._table = TableModel(
             data = self._data,
-            undo = self._undo_stack
+            undo = self._undo_stack,
+            mode = self._study.time_system
         )
 
         if self._data.header[0] == "time":
             self._delegate_time = ExTimeDelegate(
                 data = self._data,
-                mode = "type",
-                parent=self
+                mode = self._study.time_system,
+                parent = self
             )
 
             table.setItemDelegateForColumn(