diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
index 8881ecda..2ea95d5e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -250,8 +250,9 @@ public class AutofillService extends AccessibilityService {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             dismiss = !getWindows().contains(window);
         } else {
-            dismiss = !(event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
-                    && event.getPackageName().toString().contains("inputmethod"));
+            dismiss = !(event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED &&
+                    event.getPackageName() != null &&
+                    event.getPackageName().toString().contains("inputmethod"));
         }
         if (dismiss && dialog != null && dialog.isShowing()) {
             dialog.dismiss();
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 09b026d1..d675d7d1 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -55,6 +55,11 @@
             android:key="copy_on_decrypt"
             android:summary="@string/pref_copy_dialog_title"
             android:title="@string/pref_copy_title" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="clear_after_copy"
+            android:summary="After an automatic copy or a manual copy of the password, the clipboard will be automatically cleared."
+            android:title="Automatically clear the clipboard after copy" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="filter_recursively"