diff --git a/app/src/androidTest/java/com/futsch1/medtimer/NotificationTest.kt b/app/src/androidTest/java/com/futsch1/medtimer/NotificationTest.kt
index 35f81ee6f..b30976419 100644
--- a/app/src/androidTest/java/com/futsch1/medtimer/NotificationTest.kt
+++ b/app/src/androidTest/java/com/futsch1/medtimer/NotificationTest.kt
@@ -814,10 +814,9 @@ class NotificationTest : BaseTestHelper() {
         device: UiDevice,
         context: Context
     ) {
-        val o1 = device.findObject(By.desc(context.getString(R.string.taken)))
         while (device.findObject(By.text(context.getString(R.string.snooze))) != null) {
             try {
-                o1.click()
+                device.findObject(By.desc(context.getString(R.string.taken)))?.click()
             } catch (_: StaleObjectException) {
                 // Ignore
             }
diff --git a/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/AlarmFragment.kt b/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/AlarmFragment.kt
index 48fd3950e..930e44b86 100644
--- a/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/AlarmFragment.kt
+++ b/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/AlarmFragment.kt
@@ -133,12 +133,11 @@ class AlarmFragment(
 
     private fun closeWithIntent(pendingIntent: PendingIntent) {
         pendingIntent.send()
-        requireActivity().supportFragmentManager.beginTransaction().remove(this).commit()
+        requireActivity().finishAndRemoveTask()
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         Log.d(ALARM, "Closing activity")
-        requireActivity().finishAndRemoveTask()
     }
 }
\ No newline at end of file
diff --git a/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/ReminderAlarmActivity.kt b/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/ReminderAlarmActivity.kt
index 3789fb68a..b92754568 100644
--- a/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/ReminderAlarmActivity.kt
+++ b/feature/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/ReminderAlarmActivity.kt
@@ -169,11 +169,17 @@ class ReminderAlarmActivity : AppCompatActivity() {
         return true
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        addAlarmFragment(intent)
+    }
+
     private fun addAlarmFragment(intent: Intent?) {
         if (intent != null) {
             Log.d(LogTags.ALARM, "Adding alarm fragment")
             supportFragmentManager.beginTransaction()
-                .add(R.id.alarmFragmentContainer, AlarmFragment::class.java, intent.extras).commit()
+                .replace(R.id.alarmFragmentContainer, AlarmFragment::class.java, intent.extras).commit()
         }
     }