diff --git a/web/components/issues/issue-layouts/properties/date.tsx b/web/components/issues/issue-layouts/properties/date.tsx
index f39741e19..1ba4dbaaa 100644
--- a/web/components/issues/issue-layouts/properties/date.tsx
+++ b/web/components/issues/issue-layouts/properties/date.tsx
@@ -46,24 +46,25 @@ export const IssuePropertyDate: React.FC<IIssuePropertyDate> = observer((props)
                 disabled ? "cursor-not-allowed text-custom-text-200" : "cursor-pointer hover:bg-custom-background-80"
               }`}
             >
-              <Tooltip tooltipHeading={placeHolder} tooltipContent={value ?? "None"}>
-                <div className="overflow-hidden flex justify-center items-center gap-2">
-                  <Calendar className="h-3 w-3" strokeWidth={2} />
-                  {value && (
-                    <>
+              <div className="overflow-hidden flex justify-center items-center gap-2">
+                <Calendar className="h-3 w-3" strokeWidth={2} />
+                {value && (
+                  <>
+                    <Tooltip tooltipHeading={placeHolder} tooltipContent={value ?? "None"}>
                       <div className="text-xs">{value}</div>
-                      <div
-                        className="flex-shrink-0 flex justify-center items-center"
-                        onClick={() => {
-                          if (onChange) onChange(null);
-                        }}
-                      >
-                        <X className="h-2.5 w-2.5" strokeWidth={2} />
-                      </div>
-                    </>
-                  )}
-                </div>
-              </Tooltip>
+                    </Tooltip>
+
+                    <div
+                      className="flex-shrink-0 flex justify-center items-center"
+                      onClick={() => {
+                        if (onChange) onChange(null);
+                      }}
+                    >
+                      <X className="h-2.5 w-2.5" strokeWidth={2} />
+                    </div>
+                  </>
+                )}
+              </div>
             </Popover.Button>
 
             <div className={`${open ? "fixed z-20 top-0 left-0 h-full w-full cursor-auto" : ""}`}>