diff --git a/components/dash-core-components/src/components/css/datepickers.css b/components/dash-core-components/src/components/css/datepickers.css
index 45f89ecc01..3ba6842ce5 100644
--- a/components/dash-core-components/src/components/css/datepickers.css
+++ b/components/dash-core-components/src/components/css/datepickers.css
@@ -298,3 +298,8 @@
     width: 20px;
     height: 20px;
 }
+
+.dash-datepicker-calendar-padding {
+    pointer-events: none;
+    background: transparent;
+}
diff --git a/components/dash-core-components/src/utils/calendar/helpers.ts b/components/dash-core-components/src/utils/calendar/helpers.ts
index 82b085eb70..7fb7ea89d9 100644
--- a/components/dash-core-components/src/utils/calendar/helpers.ts
+++ b/components/dash-core-components/src/utils/calendar/helpers.ts
@@ -35,6 +35,7 @@ function convertFormatTokens(momentFormat: string): string {
         .replace(/Do/g, 'do') // Ordinal day: 1st, 2nd, 3rd
         .replace(/YYYY/g, 'yyyy') // 4-digit year
         .replace(/YY/g, 'yy') // 2-digit year
+        .replace(/Y/g, 'y') // Year (numeric, variable length)
         .replace(/DD/g, 'dd') // Day of month with leading zero
         .replace(/D/g, 'd') // Day of month
         .replace(/X/g, 't'); // Unix timestamp (seconds)