diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt
index 48535ce..93b2f82 100644
--- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt
+++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt
@@ -266,7 +266,7 @@ private fun CustomButton(modifier: Modifier = Modifier, text: String, onClick: (
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun DatePickerDocked() {
+fun DatePickerDocked(onDateSelected: (Long) -> Unit) {
     var showDatePicker by remember { mutableStateOf(false) }
     val datePickerState = rememberDatePickerState()
     val selectedDate = datePickerState.selectedDateMillis?.let {
@@ -300,6 +300,10 @@ fun DatePickerDocked() {
                     TextButton(
                         onClick = {
                             showDatePicker = false
+                            // Notify the parent about the selected date
+                            datePickerState.selectedDateMillis?.let { millis ->
+                                onDateSelected(millis)
+                            }
                         }
                     ) {
                         Text("OK")
diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
index caa3d45..7dc77ab 100644
--- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
+++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
@@ -31,6 +31,7 @@ fun Add(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, HomeViewModel
     var name by remember { mutableStateOf("") }
     var spending by remember { mutableStateOf("") }
 
+    var selectedDate by remember { mutableStateOf<Long?>(null) }
     var expanded by remember { mutableStateOf(false) }
     var selectedItem by remember { mutableStateOf("") }
     val categories = listOf("Option 1", "Option 2", "Option 3")
@@ -93,7 +94,9 @@ fun Add(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, HomeViewModel
                 }
             }
 
-            DatePickerDocked()
+            DatePickerDocked{
+                dateMilis -> selectedDate = dateMilis
+            }
         }
 
         Box(
diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
index b03343b..1c2282f 100644
--- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
+++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
@@ -32,6 +32,7 @@ fun Edit(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, HomeViewMode
     var name by remember { mutableStateOf("") }
     var spending by remember { mutableStateOf("") }
 
+    var selectedDate by remember { mutableStateOf<Long?>(null) }
     var expanded by remember { mutableStateOf(false) }
     var selectedItem by remember { mutableStateOf("") }
     val categories = listOf("Option 1", "Option 2", "Option 3")
@@ -94,7 +95,9 @@ fun Edit(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, HomeViewMode
                 }
             }
 
-            DatePickerDocked()
+            DatePickerDocked{
+                    dateMilis -> selectedDate = dateMilis
+            }
         }
 
         Box(