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 5e355159b..ee6453442 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,6 +61,7 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
             .setItems(R.array.snooze_picker_names, null)
             .create()
         dialog!!.listView.onItemClickListener = this
+        dialog!!.setOnDismissListener { finish() }
         dialog!!.show()
         SystemUtils.unlockScreen(this)
     }
@@ -92,15 +93,4 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         super.finish()
         overridePendingTransition(0, 0)
     }
-
-    override fun onResume() {
-        SystemUtils.unlockScreen(this)
-        super.onResume()
-        if (dialog != null) dialog!!.show()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (dialog != null) dialog!!.dismiss()
-    }
 }