diff --git a/Smartway.UiComponent/Inputs/NumericDateEntry.xaml.cs b/Smartway.UiComponent/Inputs/NumericDateEntry.xaml.cs
index 462ed0b..1ed68b2 100644
--- a/Smartway.UiComponent/Inputs/NumericDateEntry.xaml.cs
+++ b/Smartway.UiComponent/Inputs/NumericDateEntry.xaml.cs
@@ -177,7 +177,7 @@ protected virtual void SetFilledDate()
 
         private void SetEntriesPosition()
         {
-            if (IsDayMonthCalendar())
+            if (IsDayMonthCalendar() || IsYearsFirstCalendar())
             {
                 DayEntry = FirstEntry;
                 MonthEntry = SecondEntry;
@@ -205,7 +205,7 @@ private bool DateTimeIsNull(DateTime date)
 
         private void SetDefaultPlaceholder()
         {
-            if (IsDayMonthCalendar())
+            if (IsDayMonthCalendar() || IsYearsFirstCalendar())
             {
                 DayEntry.Placeholder = "JJ";
                 MonthEntry.Placeholder = "MM";
@@ -226,6 +226,13 @@ private bool IsDayMonthCalendar()
             return calendarType.IndexOf("d") < calendarType.IndexOf("M");
         }
 
+        private bool IsYearsFirstCalendar()
+        {
+            var calendarType =
+                CultureInfo.GetCultureInfo(CultureInfo.CurrentCulture.Name).DateTimeFormat.YearMonthPattern;
+            return calendarType.IndexOf("y") < calendarType.IndexOf("M");
+        }
+
         private void OnFocusedSelectAllEntryContent(object sender, FocusEventArgs e)
         {
             var entry = sender as Entry;