diff --git a/app/src/main/java/org/tasks/compose/pickers/DatePickerBottomSheet.kt b/app/src/main/java/org/tasks/compose/pickers/DatePickerBottomSheet.kt
index 364da7f02..2a7cd07b9 100644
--- a/app/src/main/java/org/tasks/compose/pickers/DatePickerBottomSheet.kt
+++ b/app/src/main/java/org/tasks/compose/pickers/DatePickerBottomSheet.kt
@@ -29,7 +29,6 @@ import androidx.compose.material3.SheetState
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -42,7 +41,7 @@ import org.tasks.R
 fun DatePickerBottomSheet(
     sheetState: SheetState,
     showButtons: Boolean,
-    dismiss: () -> Unit,
+    cancel: () -> Unit,
     accept: () -> Unit,
     setDisplayMode: (DisplayMode) -> Unit,
     dateShortcuts: @Composable ColumnScope.() -> Unit,
@@ -52,7 +51,7 @@ fun DatePickerBottomSheet(
     ModalBottomSheet(
         modifier = Modifier.statusBarsPadding(),
         sheetState = sheetState,
-        onDismissRequest = { dismiss() },
+        onDismissRequest = { accept() },
         containerColor = MaterialTheme.colorScheme.surface,
     ) {
         Box(
@@ -116,7 +115,7 @@ fun DatePickerBottomSheet(
                         }
                         Spacer(modifier = Modifier.weight(1f))
                         TextButton(
-                            onClick = { dismiss() }
+                            onClick = { cancel() }
                         ) {
                             Text(stringResource(R.string.cancel))
                         }
diff --git a/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt b/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt
index 585e5c068..3a7153cde 100644
--- a/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt
+++ b/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt
@@ -154,7 +154,7 @@ class DateTimePicker : BaseDateTimePicker() {
                 },
                 setDateDisplayMode = { preferences.calendarDisplayMode = it },
                 setTimeDisplayMode = { preferences.timeDisplayMode = it },
-                dismiss = { onDismissHandler?.onDismiss() ?: dismiss() },
+                cancel = { onDismissHandler?.onDismiss() ?: dismiss() },
                 accept = { sendSelected() },
                 setDateTime = { day, time -> returnDate(day, time) },
                 setTime = { returnSelectedTime(it) },
@@ -282,7 +282,7 @@ fun DueDatePicker(
     showNoDate: Boolean,
     setDateDisplayMode: (DisplayMode) -> Unit,
     setTimeDisplayMode: (DisplayMode) -> Unit,
-    dismiss: () -> Unit,
+    cancel: () -> Unit,
     accept: () -> Unit,
     setDateTime: (Long, Int) -> Unit,
     setTime: (Int) -> Unit,
@@ -292,7 +292,7 @@ fun DueDatePicker(
         state = datePickerState,
         showButtons = showButtons,
         setDisplayMode = setDateDisplayMode,
-        dismiss = dismiss,
+        cancel = cancel,
         accept = accept,
         dateShortcuts = {
             DueDateShortcuts(
@@ -393,7 +393,7 @@ fun DueDatePickerPreview() {
             showNoDate = true,
             setDateDisplayMode = {},
             setTimeDisplayMode = {},
-            dismiss = {},
+            cancel = {},
             accept = {},
             setDateTime = { _, _ -> },
             setTime = {},
diff --git a/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt b/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt
index 7729b2671..d9329951a 100644
--- a/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt
+++ b/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt
@@ -95,7 +95,7 @@ class StartDatePicker : BaseDateTimePicker() {
                 state = state,
                 showButtons = !autoclose,
                 setDisplayMode = { preferences.calendarDisplayMode = it },
-                dismiss = { onDismissHandler?.onDismiss() ?: dismiss() },
+                cancel = { onDismissHandler?.onDismiss() ?: dismiss() },
                 accept = { sendSelected() },
                 dateShortcuts = {
                     StartDateShortcuts(