diff --git a/libs/portal-layout-styles/src/styles/primeng/sass/theme/extensions/_calendar.scss b/libs/portal-layout-styles/src/styles/primeng/sass/theme/extensions/_calendar.scss
index a93ab54c..2ea035eb 100644
--- a/libs/portal-layout-styles/src/styles/primeng/sass/theme/extensions/_calendar.scss
+++ b/libs/portal-layout-styles/src/styles/primeng/sass/theme/extensions/_calendar.scss
@@ -86,6 +86,18 @@
     }
   }
 
+  .p-monthpicker .p-monthpicker-month:not(.p-disabled):not(.p-highlight):focus {
+      outline: $calendarFocusOutline;
+      outline-offset: $calendarFocusOutlineOffset;
+      box-shadow: none;
+    }
+
+  .p-yearpicker .p-yearpicker-year:not(.p-disabled):not(.p-highlight):focus  {
+    outline: $calendarFocusOutline;
+    outline-offset: $calendarFocusOutlineOffset;
+    box-shadow: none;
+  }
+
   table {
     th {
       border-bottom: var(--divider);