2 files changed, 7 insertions, 1 deletions

diff --git a/views/calendar/qml/DateSelector.qml b/views/calendar/qml/DateSelector.qml
index cdaa819b..890a1a8b 100644
--- a/views/calendar/qml/DateSelector.qml
+++ b/views/calendar/qml/DateSelector.qml
@@ -97,5 +97,9 @@ Column {
                 visible: model.day === root.selectedDate.getDate() && model.month === root.selectedDate.getMonth()
             }
         }
+
+        onClicked: {
+            root.selectedDate = date
+        }
     }
 }
diff --git a/views/calendar/qml/View.qml b/views/calendar/qml/View.qml
index f49d8bff..3fc5d021 100644
--- a/views/calendar/qml/View.qml
+++ b/views/calendar/qml/View.qml
@@ -105,9 +105,11 @@ RowLayout {
             spacing: Kube.Units.largeSpacing
 
             DateSelector {
+                id: dateSelector
                 selectedDate: root.selectedDate
                 onSelectedDateChanged: {
-                    root.selectedDate = selectedDate
+                    root.selectedDate = getFirstDayOfWeek(dateSelector.selectedDate)
+                    selectedDate = root.selectedDate
                 }
             }