diff --git a/src/App.vue b/src/App.vue
index ca22d3e..f1d6afa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -53,7 +53,9 @@ function loadStorageTimetables() {
 
 function setupDarkMode() {
   globalStore.darkMode =
-    localStorage.currentTheme === 'dark' || (!('currentTheme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
+    localStorage.currentTheme === 'dark' ||
+    (!('currentTheme' in localStorage) &&
+      window.matchMedia('(prefers-color-scheme: dark)').matches);
 }
 
 function setupAfterPrintClose() {
diff --git a/src/components/Timetable/TimetableSelect.vue b/src/components/Timetable/TimetableSelect.vue
index d64e15b..1d78a31 100644
--- a/src/components/Timetable/TimetableSelect.vue
+++ b/src/components/Timetable/TimetableSelect.vue
@@ -123,6 +123,7 @@ import {
 } from '@heroicons/vue/16/solid';
 import { getRegionNameById } from '../../utils/trainUtils';
 import type { TimetableData, ViewMode } from '../../types/common.types';
+import { watch } from 'vue';
 
 // Stores
 const apiStore = useApiStore();
@@ -137,6 +138,16 @@ const isTimetableSaved = computed(() => {
   );
 });
 
+// Watchers
+watch(
+  () => globalStore.selectedActiveTrain,
+  (curr) => {
+    if (curr != null) {
+      globalStore.generatedDate = new Date();
+    }
+  }
+);
+
 // Methods
 function selectTrain() {
   if (!apiStore.activeData) return;
@@ -144,10 +155,6 @@ function selectTrain() {
   globalStore.selectedActiveTrain =
     globalStore.activeTimetableTrains.find((train) => train.id == globalStore.selectedTrainId) ??
     null;
-
-  if (globalStore.selectedActiveTrain != null) {
-    globalStore.generatedDate = new Date();
-  }
 }
 
 function toggleViewMode(viewMode: ViewMode) {