diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
index 4723bc9de..15e95fedc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
@@ -61,7 +61,9 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
         val chooserDialog =
             childFragmentManager.findFragmentByTag("FOLDER_CHOOSER") as BlacklistFolderChooserDialog?
         chooserDialog?.setCallback(this)
-        refreshBlacklistData()
+        val context = requireActivity()
+
+        refreshBlacklistData(context)
         return materialDialog(R.string.blacklist)
             .setPositiveButton(R.string.done) { _, _ ->
                 dismiss()
@@ -69,7 +71,9 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
             .setNeutralButton(R.string.clear_action) { _, _ ->
                 materialDialog(R.string.clear_blacklist)
                     .setMessage(R.string.do_you_want_to_clear_the_blacklist)
-                    .setPositiveButton(R.string.clear_action, null)
+                    .setPositiveButton(R.string.clear_action) { _, _ ->
+                        BlacklistStore.getInstance(context).clear()
+                    }
                     .setNegativeButton(android.R.string.cancel, null)
                     .create()
                     .colorButtons()
@@ -89,9 +93,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
                         ).parseAsHtml()
                     )
                     .setPositiveButton(R.string.remove_action) { _, _ ->
-                        BlacklistStore.getInstance(requireContext())
-                            .removePath(File(paths[which]))
-                        refreshBlacklistData()
+                        BlacklistStore.getInstance(context).removePath(File(paths[which]))
                     }
                     .setNegativeButton(android.R.string.cancel, null)
                     .create()
@@ -102,23 +104,16 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
                 setOnShowListener {
                     getButton(AlertDialog.BUTTON_POSITIVE).accentTextColor()
                     getButton(AlertDialog.BUTTON_NEGATIVE).accentTextColor()
-                    getButton(AlertDialog.BUTTON_NEUTRAL).apply {
-                        accentTextColor()
-                        setOnClickListener {
-                            BlacklistStore.getInstance(
-                                requireContext()
-                            ).clear()
-                            dismiss()
-                        }
-                    }
+                    getButton(AlertDialog.BUTTON_NEUTRAL).accentTextColor()
                 }
             }
     }
 
     private lateinit var paths: ArrayList<String>
 
-    private fun refreshBlacklistData() {
-        this.paths = BlacklistStore.getInstance(requireContext()).paths
+    private fun refreshBlacklistData(context: Context?) {
+        if (context == null) return
+        this.paths = BlacklistStore.getInstance(context).paths
         val dialog = dialog as MaterialAlertDialogBuilder?
         dialog?.setItems(paths.toTypedArray(), null)
     }