diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt
index dcb237780327fd9c4209be035059a0042ad13fb6..ea041c6354cfc40cb437c6f5cc5314cc38141092 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt
@@ -61,7 +61,10 @@ class ContactDiaryLocationBottomSheetDialogFragment : BottomSheetDialogFragment(
 
         binding.contactDiaryLocationBottomSheetTextInputEditText.setOnEditorActionListener { v, actionId, event ->
             return@setOnEditorActionListener when (actionId) {
-                EditorInfo.IME_ACTION_DONE -> false
+                EditorInfo.IME_ACTION_DONE -> {
+                    binding.contactDiaryLocationBottomSheetSaveButton.performClick()
+                    false
+                }
                 else -> true
             }
         }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt
index 576668bebac257d3826d7749238dc87df1a859f8..bed3a793367c7a83c4cebb657301321d129c4358 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt
@@ -61,7 +61,10 @@ class ContactDiaryPersonBottomSheetDialogFragment : BottomSheetDialogFragment(),
 
         binding.contactDiaryPersonBottomSheetTextInputEditText.setOnEditorActionListener { v, actionId, event ->
             return@setOnEditorActionListener when (actionId) {
-                EditorInfo.IME_ACTION_DONE -> false
+                EditorInfo.IME_ACTION_DONE -> {
+                    binding.contactDiaryPersonBottomSheetSaveButton.performClick()
+                    false
+                }
                 else -> true
             }
         }