diff --git a/src/components/Measurements/widgets/EntryForm.tsx b/src/components/Measurements/widgets/EntryForm.tsx
index e9186fe0..d4f49f93 100644
--- a/src/components/Measurements/widgets/EntryForm.tsx
+++ b/src/components/Measurements/widgets/EntryForm.tsx
@@ -1,5 +1,5 @@
 import { Button, Stack, TextField } from "@mui/material";
-import { DatePicker, LocalizationProvider } from "@mui/x-date-pickers";
+import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
 import { AdapterLuxon } from "@mui/x-date-pickers/AdapterLuxon";
 import { LoadingPlaceholder } from "components/Core/LoadingWidget/LoadingWidget";
 import { MeasurementEntry } from "components/Measurements/models/Entry";
@@ -13,7 +13,6 @@ import { DateTime, Settings } from "luxon";
 import React from 'react';
 import { useTranslation } from "react-i18next";
 import { TIMEZONE } from "utils/consts";
-import { dateToYYYYMMDD } from "utils/date";
 import * as yup from 'yup';
 
 Settings.defaultZone = TIMEZONE;
@@ -87,32 +86,17 @@ export const EntryForm = ({ entry, closeFn, categoryId }: EntryFormProps) => {
                         {categoryQuery.isLoading
                             ? <LoadingPlaceholder />
                             : <LocalizationProvider dateAdapter={AdapterLuxon} adapterLocale={i18n.language}>
-                                <DatePicker
-                                    format="yyyy-MM-dd"
+                                <DateTimePicker
                                     label={t('date')}
                                     value={dateValue}
+                                    slotProps={{ textField: { variant: 'outlined' } }}
                                     disableFuture={true}
-
                                     onChange={(newValue) => {
                                         if (newValue) {
                                             formik.setFieldValue('date', newValue.toJSDate());
                                         }
                                         setDateValue(newValue);
                                     }}
-                                    shouldDisableDate={(date) => {
-                                        // Allow the date of the current weight entry, since we are editing it
-                                        if (entry && dateToYYYYMMDD(entry.date) === dateToYYYYMMDD(date.toJSDate())) {
-                                            return false;
-                                        }
-
-                                        // if date is in list of existing entries, disable it
-                                        if (date) {
-                                            return categoryQuery.data!.entries.some(entry => dateToYYYYMMDD(entry.date) === dateToYYYYMMDD(date.toJSDate()));
-                                        }
-
-                                        // all other dates are allowed
-                                        return false;
-                                    }}
                                 />
                             </LocalizationProvider>}
 
@@ -136,4 +120,4 @@ export const EntryForm = ({ entry, closeFn, categoryId }: EntryFormProps) => {
             )}
         </Formik>)
     );
-};
+};
\ No newline at end of file