diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs
index 4061e9cd..14b714cf 100644
--- a/cosmic-applet-time/src/window.rs
+++ b/cosmic-applet-time/src/window.rs
@@ -119,6 +119,8 @@ impl cosmic::Application for Window {
                 if let Some(p) = self.popup.take() {
                     destroy_popup(p)
                 } else {
+                    self.date_selected = NaiveDate::from(self.now.naive_local());
+
                     let new_id = window::Id::unique();
                     self.popup.replace(new_id);
 
@@ -166,21 +168,27 @@ impl cosmic::Application for Window {
                 Command::none()
             }
             Message::SelectDay(_day) => {
-                // TODO
+                if let Some(date) = self.date_selected.with_day(_day) {
+                    self.date_selected = date;
+                } else {
+                    tracing::error!("invalid naivedate");
+                }
                 Command::none()
             }
             Message::PreviousMonth => {
-                self.date_selected = self
-                    .date_selected
-                    .checked_sub_months(Months::new(1))
-                    .expect("valid naivedate");
+                if let Some(date) = self.date_selected.checked_sub_months(Months::new(1)) {
+                    self.date_selected = date;
+                } else {
+                    tracing::error!("invalid naivedate");
+                }
                 Command::none()
             }
             Message::NextMonth => {
-                self.date_selected = self
-                    .date_selected
-                    .checked_add_months(Months::new(1))
-                    .expect("valid naivedate");
+                if let Some(date) = self.date_selected.checked_add_months(Months::new(1)) {
+                    self.date_selected = date;
+                } else {
+                    tracing::error!("invalid naivedate");
+                }
                 Command::none()
             }
             Message::OpenDateTimeSettings => {