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 857c8276..fb6bc8fa 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -59,8 +59,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         // create a new view
         View v = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.password_row_layout, parent, false);
-        ViewHolder vh = new ViewHolder(v);
-        return vh;
+        return new ViewHolder(v);
     }
 
     // Replace the contents of a view (invoked by the layout manager)
@@ -198,6 +197,12 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         if (!selectedItems.remove(position)) {
             selectedItems.add(position);
         }
+        for (int selected : selectedItems) {
+            if (selected > position) {
+                selectedItems.remove(selected);
+                selectedItems.add(selected - 1);
+            }
+        }
         notifyItemChanged(position);
     }