diff --git a/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml
index 9e6ad8cee..141cfc414 100644
--- a/uhabits-android/src/main/AndroidManifest.xml
+++ b/uhabits-android/src/main/AndroidManifest.xml
@@ -148,6 +148,7 @@
 
         <activity
             android:name=".notifications.SnoozeDelayPickerActivity"
+            android:taskAffinity=""
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
@@ -303,4 +304,4 @@
         </provider>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt
index 3ec9caa2c..5e355159b 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt
@@ -61,7 +61,6 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
             .setItems(R.array.snooze_picker_names, null)
             .create()
         dialog!!.listView.onItemClickListener = this
-        dialog!!.setOnDismissListener { finish() }
         dialog!!.show()
         SystemUtils.unlockScreen(this)
     }
@@ -94,8 +93,14 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         overridePendingTransition(0, 0)
     }
 
+    override fun onResume() {
+        SystemUtils.unlockScreen(this)
+        super.onResume()
+        if (dialog != null) dialog!!.show()
+    }
+
     override fun onPause() {
-        if (dialog != null) dialog!!.dismiss()
         super.onPause()
+        if (dialog != null) dialog!!.dismiss()
     }
 }