2 files changed, 13 insertions, 6 deletions
diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml
index f5f0e46..79659c5 100644
--- a/modules/dashboard/Content.qml
+++ b/modules/dashboard/Content.qml
@@ -85,6 +85,7 @@ Item {
                 id: row
 
                 Pane {
+                    index: 0
                     sourceComponent: Dash {
                         visibilities: root.visibilities
                         state: root.state
@@ -92,16 +93,19 @@ Item {
                 }
 
                 Pane {
+                    index: 1
                     sourceComponent: Media {
                         visibilities: root.visibilities
                     }
                 }
 
                 Pane {
+                    index: 2
                     sourceComponent: Performance {}
                 }
 
                 Pane {
+                    index: 3
                     sourceComponent: Weather {}
                 }
             }
@@ -127,9 +131,15 @@ Item {
     }
 
     component Pane: Loader {
+        id: pane
+
+        required property int index
+
         Layout.alignment: Qt.AlignTop
 
         Component.onCompleted: active = Qt.binding(() => {
+            // Always keep current tab loaded
+            if (pane.index === view.currentIndex) return true;
             const vx = Math.floor(view.visibleArea.xPosition * view.contentWidth);
             const vex = Math.floor(vx + view.visibleArea.widthRatio * view.contentWidth);
             return (vx >= x && vx <= x + implicitWidth) || (vex >= x && vex <= x + implicitWidth);
diff --git a/modules/dashboard/dash/DateTime.qml b/modules/dashboard/dash/DateTime.qml
index bbef067..e740448 100644
--- a/modules/dashboard/dash/DateTime.qml
+++ b/modules/dashboard/dash/DateTime.qml
@@ -9,8 +9,6 @@ import QtQuick.Layouts
 Item {
     id: root
 
-    readonly property list<string> timeComponents: Time.format(Config.services.useTwelveHourClock ? "hh:mm:A" : "hh:mm").split(":")
-
     anchors.top: parent.top
     anchors.bottom: parent.bottom
     implicitWidth: Config.dashboard.sizes.dateTimeWidth
@@ -24,7 +22,7 @@ Item {
         StyledText {
             Layout.bottomMargin: -(font.pointSize * 0.4)
             Layout.alignment: Qt.AlignHCenter
-            text: root.timeComponents[0]
+            text: Time.hourStr
             color: Colours.palette.m3secondary
             font.pointSize: Appearance.font.size.extraLarge
             font.family: Appearance.font.family.clock
@@ -42,7 +40,7 @@ Item {
         StyledText {
             Layout.topMargin: -(font.pointSize * 0.4)
             Layout.alignment: Qt.AlignHCenter
-            text: root.timeComponents[1]
+            text: Time.minuteStr
             color: Colours.palette.m3secondary
             font.pointSize: Appearance.font.size.extraLarge
             font.family: Appearance.font.family.clock
@@ -52,12 +50,11 @@ Item {
         Loader {
             Layout.alignment: Qt.AlignHCenter
 
-            asynchronous: true
             active: Config.services.useTwelveHourClock
             visible: active
 
             sourceComponent: StyledText {
-                text: root.timeComponents[2] ?? ""
+                text: Time.amPmStr
                 color: Colours.palette.m3primary
                 font.pointSize: Appearance.font.size.large
                 font.family: Appearance.font.family.clock