diff --git a/components/inputDate.tsx b/components/inputDate.tsx
index 40f7710..f627855 100644
--- a/components/inputDate.tsx
+++ b/components/inputDate.tsx
@@ -28,7 +28,7 @@ type Props = {
 export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) {
    const [modal, setModal] = useState(false);
    const [valueFix, setValueFix] = useState(new Date())
-   const [valueFirst, setValueFirst] = useState("")
+   const [valueFirst, setValueFirst] = useState(mode == "date" ? dayjs(new Date()).format("DD-MM-YYYY") : mode == "time" ? dayjs(new Date()).format("HH:mm") : "")
 
    const onChangeDate = (type: string, selectedDate: any) => {
       if (type === "set") {
@@ -45,6 +45,8 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
             onChange(formatted)
             setModal(false)
          }
+      } else if (type === "dismissed") {
+         setModal(false)
       }
    };
 
@@ -100,11 +102,8 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
                         value={valueFix}
                         mode={mode}
                         display="spinner"
-                        onChange={(event, date) => {
-                           onChangeDate(event.type, date)
-                        }}
+                        onChange={(event, date) => { onChangeDate(event.type, date) }}
                         onTouchCancel={() => setModal(false)}
-
                      />
                   </ModalFloat>
                )
@@ -115,7 +114,7 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
                      mode={mode}
                      display="inline"
                      onChange={(event, date) => { onChangeDate(event.type, date) }}
-                     onTouchCancel={() => setModal(false)}
+                     onTouchCancel={() => { setModal(false) }}
                   />
                )
             )