diff --git a/examples/vite-demo-vanilla-bundle/package.json b/examples/vite-demo-vanilla-bundle/package.json
index cc95f6acb..29afeb870 100644
--- a/examples/vite-demo-vanilla-bundle/package.json
+++ b/examples/vite-demo-vanilla-bundle/package.json
@@ -30,7 +30,6 @@
     "fetch-jsonp": "^1.3.0",
     "multiple-select-vanilla": "^3.2.0",
     "rxjs": "^7.8.1",
-    "vanilla-calendar-picker": "^2.11.4",
     "whatwg-fetch": "^3.6.20"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
index 22ac73489..d9223775b 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,6 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
     "typescript-eslint": "^7.8.0",
-    "vanilla-calendar-picker": "^2.11.4",
     "whatwg-fetch": "^3.6.20"
   },
   "funding": {
diff --git a/packages/common/package.json b/packages/common/package.json
index 6bed29228..6e96bcafd 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -77,7 +77,7 @@
     "multiple-select-vanilla": "^3.2.0",
     "sortablejs": "^1.15.2",
     "un-flatten-tree": "^2.0.12",
-    "vanilla-calendar-picker": "^2.11.4"
+    "vanilla-calendar-picker": "^2.11.5"
   },
   "devDependencies": {
     "autoprefixer": "^10.4.19",
diff --git a/packages/utils/src/domUtils.ts b/packages/utils/src/domUtils.ts
index eb8dc359f..49e03ebc3 100644
--- a/packages/utils/src/domUtils.ts
+++ b/packages/utils/src/domUtils.ts
@@ -18,9 +18,9 @@ export function calculateAvailableSpace(element: HTMLElement): { top: number; bo
     const elementOffsetTop = elmOffset.top ?? 0;
     const elementOffsetLeft = elmOffset.left ?? 0;
     top = elementOffsetTop - pageScrollTop;
-    bottom = windowHeight - (elementOffsetTop - pageScrollTop);
     left = elementOffsetLeft - pageScrollLeft;
-    right = windowWidth - (elementOffsetLeft - pageScrollLeft);
+    bottom = windowHeight - (elementOffsetTop - pageScrollTop + element.clientHeight);
+    right = windowWidth - (elementOffsetLeft - pageScrollLeft + element.clientWidth);
   }
 
   return { top, bottom, left, right };
diff --git a/packages/vanilla-bundle/package.json b/packages/vanilla-bundle/package.json
index 7ec78f16d..7804185fc 100644
--- a/packages/vanilla-bundle/package.json
+++ b/packages/vanilla-bundle/package.json
@@ -60,7 +60,6 @@
     "@slickgrid-universal/utils": "workspace:~",
     "dequal": "^2.0.3",
     "sortablejs": "^1.15.2",
-    "vanilla-calendar-picker": "^2.11.4",
     "whatwg-fetch": "^3.6.20"
   },
   "devDependencies": {
diff --git a/packages/vanilla-force-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip b/packages/vanilla-force-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip
index 76d7305a6..437e79ce8 100644
Binary files a/packages/vanilla-force-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip and b/packages/vanilla-force-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip differ
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 958419f35..400facb62 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -122,9 +122,6 @@ importers:
       typescript-eslint:
         specifier: ^7.8.0
         version: 7.8.0(eslint@9.1.1)(typescript@5.4.5)
-      vanilla-calendar-picker:
-        specifier: ^2.11.4
-        version: 2.11.4
       whatwg-fetch:
         specifier: ^3.6.20
         version: 3.6.20
@@ -191,9 +188,6 @@ importers:
       rxjs:
         specifier: ^7.8.1
         version: 7.8.1
-      vanilla-calendar-picker:
-        specifier: ^2.11.4
-        version: 2.11.4
       whatwg-fetch:
         specifier: ^3.6.20
         version: 3.6.20
@@ -259,8 +253,8 @@ importers:
         specifier: ^2.0.12
         version: 2.0.12
       vanilla-calendar-picker:
-        specifier: ^2.11.4
-        version: 2.11.4
+        specifier: ^2.11.5
+        version: 2.11.5
     devDependencies:
       autoprefixer:
         specifier: ^10.4.19
@@ -452,9 +446,6 @@ importers:
       sortablejs:
         specifier: ^1.15.2
         version: 1.15.2
-      vanilla-calendar-picker:
-        specifier: ^2.11.4
-        version: 2.11.4
       whatwg-fetch:
         specifier: ^3.6.20
         version: 3.6.20
@@ -9170,8 +9161,9 @@ packages:
       builtins: 5.0.1
     dev: true
 
-  /vanilla-calendar-picker@2.11.4:
-    resolution: {integrity: sha512-0FJixXnw7qIf1Uvr6FbhJP4OP+hnLPjuhVRj05Uy98Or5UiXTiLoGEolNH5BvEG/bOdyPIkGohOMIrizSthDnA==}
+  /vanilla-calendar-picker@2.11.5:
+    resolution: {integrity: sha512-6XrjvctTmTP4strgTJY93u9sbPbM+iigi6ZXaOdSajLp5Lsn7mCLALSYDBYO7LVd+0iaFxn52cs0Qm6GyEjf7Q==}
+    dev: false
 
   /verror@1.10.0:
     resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}