diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
index 0a27b0f12f5b6fdf078015815167b6190a528c45..bc0aa5196e4d3bf50bdea60654275aa4ad8913a1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
@@ -58,7 +58,6 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
                     DialogHelper.showDialog(deleteLocationConfirmationDialog)
                 }
                 locationSaveButton.setOnClickListener {
-                    it.hideKeyboard()
                     viewModel.updateLocation(
                         location,
                         phoneNumber = binding.locationPhoneInput.text.toString(),
@@ -71,7 +70,6 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
             binding.apply {
                 locationDeleteButton.visibility = View.GONE
                 locationSaveButton.setOnClickListener {
-                    it.hideKeyboard()
                     viewModel.addLocation(
                         phoneNumber = binding.locationPhoneInput.text.toString(),
                         emailAddress = binding.locationEmailInput.text.toString()
@@ -84,7 +82,6 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
             locationNameInputEdit.focusAndShowKeyboard()
 
             locationCloseButton.setOnClickListener {
-                it.hideKeyboard()
                 viewModel.closePressed()
             }
             locationNameInputEdit.doAfterTextChanged {
@@ -105,6 +102,7 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
         }
 
         viewModel.shouldClose.observe2(this) {
+            binding.root.hideKeyboard()
             popBackStack()
         }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
index 88004506f32bd558f5300c5543bc00f94329801b..6379a87784dbd0f727ee8246d3de1233cf4904c7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
@@ -60,7 +60,6 @@ class ContactDiaryAddPersonFragment :
                     DialogHelper.showDialog(deletePersonConfirmationDialog)
                 }
                 personSaveButton.setOnClickListener {
-                    it.hideKeyboard()
                     viewModel.updatePerson(
                         person,
                         phoneNumber = binding.personPhoneNumberInput.text.toString(),
@@ -72,7 +71,6 @@ class ContactDiaryAddPersonFragment :
         } else {
             binding.personDeleteButton.visibility = View.GONE
             binding.personSaveButton.setOnClickListener {
-                it.hideKeyboard()
                 viewModel.addPerson(
                     phoneNumber = binding.personPhoneNumberInput.text.toString(),
                     emailAddress = binding.personEmailInput.text.toString()
@@ -84,7 +82,6 @@ class ContactDiaryAddPersonFragment :
             personNameInput.focusAndShowKeyboard()
 
             personCloseButton.setOnClickListener {
-                it.hideKeyboard()
                 viewModel.closePressed()
             }
             personNameInput.doAfterTextChanged {
@@ -105,6 +102,7 @@ class ContactDiaryAddPersonFragment :
         }
 
         viewModel.shouldClose.observe2(this) {
+            binding.root.hideKeyboard()
             popBackStack()
         }