diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js
index eafca657f3..36af1398b1 100644
--- a/packages/bbui/src/Actions/click_outside.js
+++ b/packages/bbui/src/Actions/click_outside.js
@@ -1,5 +1,6 @@
 const ignoredClasses = [
   ".flatpickr-calendar",
+  ".spectrum-Calendar",
   ".spectrum-Popover",
   ".download-js-link",
 ]
diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index 35ff4933d7..4929a9beaf 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -41,6 +41,8 @@ export default function positionDropdown(element, opts) {
         offset: opts.offset,
       })
     } else {
+      const renderHeight = maxHeight || elementBounds.height
+
       // Determine vertical styles
       const topSpace = anchorBounds.top
       const bottomSpace = window.innerHeight - anchorBounds.bottom
@@ -52,11 +54,11 @@ export default function positionDropdown(element, opts) {
           styles.top = window.innerHeight - elementBounds.height
         }
       } else if (
-        window.innerHeight - anchorBounds.bottom < (maxHeight || 100) &&
+        window.innerHeight - anchorBounds.bottom < renderHeight + offset &&
         topSpace - bottomSpace > 100
       ) {
-        styles.top = anchorBounds.top - elementBounds.height - offset
-        styles.maxHeight = maxHeight || 240
+        styles.top = anchorBounds.top - renderHeight - offset
+        styles.maxHeight = maxHeight
       } else {
         styles.top = anchorBounds.bottom + offset
         styles.maxHeight =
diff --git a/packages/bbui/src/Form/Core/DatePicker/DateInput.svelte b/packages/bbui/src/Form/Core/DatePicker/DateInput.svelte
index 653574c3e7..d3bb04a30b 100644
--- a/packages/bbui/src/Form/Core/DatePicker/DateInput.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker/DateInput.svelte
@@ -3,12 +3,13 @@
 
   export let anchor
   export let disabled
+  export let readonly
   export let error
   export let focused
   export let placeholder
   export let id
   export let value
-  export let icon = "Calendar"
+  export let icon
   export let enableTime
   export let timeOnly
 
@@ -32,11 +33,11 @@
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div
   bind:this={anchor}
-  class:is-disabled={disabled}
+  class:is-disabled={disabled || readonly}
   class:is-invalid={!!error}
   class="spectrum-InputGroup spectrum-Datepicker"
   class:is-focused={focused}
-  aria-readonly="false"
+  aria-readonly={readonly}
   aria-required="false"
   aria-haspopup="true"
   on:click
@@ -57,6 +58,7 @@
     {/if}
     <input
       {disabled}
+      {readonly}
       data-input
       type="text"
       class="spectrum-Textfield-input spectrum-InputGroup-input"
diff --git a/packages/bbui/src/Form/Core/DatePicker/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker/DatePicker.svelte
index 194bed7f9a..2686766784 100644
--- a/packages/bbui/src/Form/Core/DatePicker/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker/DatePicker.svelte
@@ -13,6 +13,7 @@
 
   export let id = null
   export let disabled = false
+  export let readonly = false
   export let error = null
   export let enableTime = true
   export let value = null
@@ -108,6 +109,7 @@
 <DateTimeInput
   bind:anchor
   {disabled}
+  {readonly}
   {error}
   {placeholder}
   {id}
@@ -125,8 +127,9 @@
   on:close
   on:open={onOpen}
   on:close={onClose}
-  {anchor}
   portalTarget={appendTo}
+  maxHeight={null}
+  {anchor}
   {align}
 >
   {#if isOpen}
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index f6bffbbf10..eb7a5db655 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -155,6 +155,7 @@
   useAnchorWidth={!autoWidth}
   maxWidth={autoWidth ? 400 : null}
   customHeight={customPopoverHeight}
+  maxHeight={240}
 >
   <div
     class="popover-content"
diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
index ed09301bb9..4d2ff87b5c 100644
--- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
+++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
@@ -20,6 +20,7 @@
 
   const ignoredOriginSelectors = [
     ".spectrum-Modal",
+    ".spectrum-Calendar",
     "#builder-side-panel-container",
     "[data-grid-ignore]",
   ]