diff --git a/__tests__/hijri.test.ts b/__tests__/hijri.test.ts
index 883720ce..3dc3d6c5 100644
--- a/__tests__/hijri.test.ts
+++ b/__tests__/hijri.test.ts
@@ -222,6 +222,7 @@ describe("Hijri", () => {
 
   test.each`
     format                   | expected
+    ${"keyboardDate"}        | ${"١٤٤١/٠٥/٠٦"}
     ${"fullDate"}            | ${"١٤٤١، جمادى الأولى ١"}
     ${"fullDateWithWeekday"} | ${"١٤٤١، جمادى الأولى ١، الأربعاء"}
     ${"normalDate"}          | ${"الأربعاء، ٦ جمادى ١"}
diff --git a/__tests__/jalaali.test.ts b/__tests__/jalaali.test.ts
index d6c1adb2..c87e0628 100644
--- a/__tests__/jalaali.test.ts
+++ b/__tests__/jalaali.test.ts
@@ -229,6 +229,7 @@ describe("Jalaali", () => {
 
   test.each`
     format                   | expected
+    ${"keyboardDate"}        | ${"۱۳۹۸/۱۰/۱۱"}
     ${"fullDate"}            | ${"۱۳۹۸، دی ۱م"}
     ${"fullDateWithWeekday"} | ${"چهارشنبه ۱م دی ۱۳۹۸"}
     ${"normalDate"}          | ${"چهارشنبه، ۱۱ دی"}
diff --git a/packages/hijri/src/hijri-utils.ts b/packages/hijri/src/hijri-utils.ts
index 60faf39e..c2c59e2b 100644
--- a/packages/hijri/src/hijri-utils.ts
+++ b/packages/hijri/src/hijri-utils.ts
@@ -35,7 +35,7 @@ const defaultFormats: DateIOFormats = {
   fullTime24h: "HH:mm",
   hours12h: "hh",
   hours24h: "HH",
-  keyboardDate: "iYYYY/iMM/dd",
+  keyboardDate: "iYYYY/iMM/iDD",
   keyboardDateTime: "iYYYY/iMM/iDD LT",
   keyboardDateTime12h: "iYYYY/iMM/iDD hh:mm A",
   keyboardDateTime24h: "iYYYY/iMM/iDD HH:mm",
diff --git a/packages/jalaali/src/jalaali-utils.ts b/packages/jalaali/src/jalaali-utils.ts
index 797f05f5..81d9625a 100644
--- a/packages/jalaali/src/jalaali-utils.ts
+++ b/packages/jalaali/src/jalaali-utils.ts
@@ -34,7 +34,7 @@ const defaultFormats: DateIOFormats = {
   fullTime24h: "HH:mm",
   hours12h: "hh",
   hours24h: "HH",
-  keyboardDate: "jYYYY/jMM/dd",
+  keyboardDate: "jYYYY/jMM/jDD",
   keyboardDateTime: "jYYYY/jMM/jDD LT",
   keyboardDateTime12h: "jYYYY/jMM/jDD hh:mm A",
   keyboardDateTime24h: "jYYYY/jMM/jDD HH:mm",