diff --git a/src/app_logic.cpp b/src/app_logic.cpp
index 8bc84cb..11be666 100644
--- a/src/app_logic.cpp
+++ b/src/app_logic.cpp
@@ -125,6 +125,10 @@ void app_logic::setup_callbacks()
 		auto task = source->get_task_by_id(taskId);
 		assert(task);
 		task->set_checked(!task->checked());
+		if (!task->has_due_date()) {
+			auto today = mirai::date(std::chrono::system_clock::now());
+			task->set_date(today);
+		}
 		_mirai_core->save();
 		update_views();
 	});
@@ -186,6 +190,7 @@ void app_logic::setup_callbacks()
 		const mirai::date &date = slint_date_to_mirai_date(newTaskData.date);
 		// const auto dayOpt = source->get_day_by_date(date);
 		task->set_title(std::string(newTaskData.title));
+		task->set_date(slint_date_to_mirai_date(newTaskData.date));
 
 		_mirai_core->save();
 		update_views();
diff --git a/src/ui/windows/AppWindow/views/TasksView.slint b/src/ui/windows/AppWindow/views/TasksView.slint
index 45ef999..b59e9c9 100644
--- a/src/ui/windows/AppWindow/views/TasksView.slint
+++ b/src/ui/windows/AppWindow/views/TasksView.slint
@@ -113,6 +113,7 @@ export component MainView inherits Rectangle {
 										padding-bottom: 8px;
 										TaskLine {
 											title: task.title;
+											date: day.due-date;
 											checked: task.checked;
 											allow-edit-date: true;
 											delete => {