diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
index e72b9e077..5ad1b890c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -98,6 +98,9 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
             public void onClick(View v) {
                 if (mActionMode != null) {
                     toggleSelection(holder.position);
+                    if (selectedItems.size() == 0) {
+                        mActionMode.finish();
+                    }
                 } else {
                     listener.onFragmentInteraction(pass);
                 }