diff --git a/packages/bbui/src/Form/Core/DatePicker/Calendar.svelte b/packages/bbui/src/Form/Core/DatePicker/Calendar.svelte
index 6491ba94ab..75e8e193e6 100644
--- a/packages/bbui/src/Form/Core/DatePicker/Calendar.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker/Calendar.svelte
@@ -125,7 +125,6 @@
   </div>
   <div
     class="spectrum-Calendar-body"
-    tabindex="0"
     aria-readonly="true"
     aria-disabled="false"
   >
@@ -194,11 +193,13 @@
     visibility: visible;
     color: var(--spectrum-global-color-gray-400);
   }
-  .spectrum-Calendar-date.is-today:before {
+  .spectrum-Calendar-date.is-today,
+  .spectrum-Calendar-date.is-today::before {
     border-color: var(--spectrum-global-color-gray-400);
   }
-  .spectrum-Calendar-date.is-today {
-    border-color: var(--spectrum-global-color-gray-400);
+  .spectrum-Calendar-date.is-today.is-selected,
+  .spectrum-Calendar-date.is-today.is-selected::before {
+    border-color: var(--spectrum-global-color-blue-700);
   }
   .spectrum-Calendar-date.is-selected:not(.is-range-selection) {
     background: var(--spectrum-global-color-blue-400);