diff --git a/src/widgets/calendar/lv_calendar_header_dropdown.c b/src/widgets/calendar/lv_calendar_header_dropdown.c
index 6a696958d0..766f0d9450 100644
--- a/src/widgets/calendar/lv_calendar_header_dropdown.c
+++ b/src/widgets/calendar/lv_calendar_header_dropdown.c
@@ -145,17 +145,20 @@ static void year_event_cb(lv_event_t * e)
 
     uint32_t sel = lv_dropdown_get_selected(dropdown);
 
+    const char * year_p = lv_dropdown_get_options(dropdown);
+
+    LV_ASSERT(3 + sel * 5 < lv_strlen(year_p));
+
+    /* NOTE: Assumes YYYY format */
+    const uint32_t year = (year_p[0 + sel * 5] - '0') * 1000 +
+                          (year_p[1 + sel * 5] - '0') * 100 +
+                          (year_p[2 + sel * 5] - '0') * 10 +
+                          (year_p[3 + sel * 5] - '0');
+
     const lv_calendar_date_t * d;
     d = lv_calendar_get_showed_date(calendar);
-
-    /* Get the first year on the options list
-     * NOTE: Assumes the first 4 digits in the option list are numbers */
-    const char * year_p = lv_dropdown_get_options(dropdown);
-    const uint32_t year = (year_p[0] - '0') * 1000 + (year_p[1] - '0') * 100 + (year_p[2] - '0') * 10 +
-                          (year_p[3] - '0');
-
     lv_calendar_date_t newd = *d;
-    newd.year = year - sel;
+    newd.year = year;
 
     lv_calendar_set_month_shown(calendar, newd.year, newd.month);
 }
@@ -165,18 +168,14 @@ static void value_changed_event_cb(lv_event_t * e)
     lv_obj_t * header = lv_event_get_current_target(e);
     lv_obj_t * calendar = lv_obj_get_parent(header);
     const lv_calendar_date_t * cur_date = lv_calendar_get_showed_date(calendar);
-
     lv_obj_t * year_dd = lv_obj_get_child(header, 0);
-
-    /* Get the first year on the options list
-     * NOTE: Assumes the first 4 digits in the option list are numbers */
-    const char * year_p = lv_dropdown_get_options(year_dd);
-    const uint32_t year = (year_p[0] - '0') * 1000 + (year_p[1] - '0') * 100 + (year_p[2] - '0') * 10 +
-                          (year_p[3] - '0');
-
-    lv_dropdown_set_selected(year_dd, year - cur_date->year);
-
     lv_obj_t * month_dd = lv_obj_get_child(header, 1);
+    const char * year_p = lv_dropdown_get_options(year_dd);
+    /* NOTE: Assumes YYYY format */
+    const int32_t first_year = (year_p[0] - '0') * 1000 +
+                               (year_p[1] - '0') * 100 +
+                               (year_p[2] - '0') * 10 + (year_p[3] - '0');
+    lv_dropdown_set_selected(year_dd, LV_ABS(first_year - cur_date->year));
     lv_dropdown_set_selected(month_dd, cur_date->month - 1);
 }
 
diff --git a/tests/src/test_cases/widgets/test_calendar.c b/tests/src/test_cases/widgets/test_calendar.c
index e671b38fd5..7d262a0986 100644
--- a/tests/src/test_cases/widgets/test_calendar.c
+++ b/tests/src/test_cases/widgets/test_calendar.c
@@ -171,6 +171,27 @@ void test_calendar_header_dropdown_create_gui(void)
     TEST_ASSERT_EQUAL_SCREENSHOT("widgets/calendar_05.png");
 }
 
+void test_calendar_header_dropdown_ascending_year_order(void)
+{
+    const char * years =  "2020\n2021\n2022\n2023\n2024\n";
+    lv_calendar_header_dropdown_create(g_calendar);
+    lv_calendar_header_dropdown_set_year_list(g_calendar, years);
+    lv_calendar_set_month_shown(g_calendar, 2022, 9);
+
+    TEST_ASSERT_EQUAL_SCREENSHOT("widgets/calendar_05.png");
+}
+
+void test_calendar_header_dropdown_descending_year_order(void)
+{
+    const char * years =  "2024\n2023\n2022\n2021\n2020\n";
+    lv_calendar_header_dropdown_create(g_calendar);
+    lv_calendar_header_dropdown_set_year_list(g_calendar, years);
+    lv_calendar_set_month_shown(g_calendar, 2022, 9);
+
+    TEST_ASSERT_EQUAL_SCREENSHOT("widgets/calendar_05.png");
+}
+
+
 void test_calendar_header_arrow_create_gui(void)
 {
     lv_calendar_add_header_arrow(g_calendar);