diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
index cdf2281b93fc8e4ce09bda9e642e8f31b1025f05..952f9801385b1c4e0ea3e572539998057df5f46d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
@@ -56,13 +56,13 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
         }
 
         setupToolbar()
+        setupRiskCard()
+        setupDiaryCard()
 
         binding.mainTracing.setOnClickListener {
             doNavigate(HomeFragmentDirections.actionMainFragmentToSettingsTracingFragment())
         }
 
-        setupRiskCard()
-
         binding.mainAbout.mainCard.apply {
             setOnClickListener {
                 ExternalActionHelper.openUrl(this@HomeFragment, getString(R.string.main_about_link))
@@ -104,10 +104,6 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
         }
 
         vm.observeTestResultToSchedulePositiveTestResultReminder()
-
-        binding.contactDiaryCard.contactDiaryCardHomescreenButton.setOnClickListener {
-            vm.moveToContactDiary()
-        }
     }
 
     override fun onResume() {
@@ -211,6 +207,13 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
         }
     }
 
+    private fun setupDiaryCard() {
+        binding.contactDiaryCard.apply {
+            contactDiaryCardHomescreenButton.setOnClickListener { vm.moveToContactDiary() }
+            contactDiaryHomescreenCard.setOnClickListener { vm.moveToContactDiary() }
+        }
+    }
+
     private fun showRiskLevelLoweredDialog() {
         val riskLevelLoweredDialog = DialogHelper.DialogInstance(
             context = requireActivity(),