diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index cfbde0d5cd..99b43915f1 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -394,6 +394,10 @@ ul.linked-with-list li {
 .modal-title {
   margin-top: 5px;
 }
+.modal .form-control {
+  position: relative;
+  z-index: 1140;
+}
 .form-group {
   margin-bottom: 7px;
 }
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index b7c9897cbb..80c211b3bf 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -224,6 +224,13 @@ ul.linked-with-list li {
 	margin-top: 5px;
 }
 
+// fixes datepicker z-index issue
+// datepicker takes zindex of input + 1 when input's position is relative
+.modal .form-control {
+	position: relative;
+	z-index: 1140;
+}
+
 .form-group {
 	margin-bottom: 7px;
 }