1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
index f83c392..fa9c637 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
@@ -478,7 +478,7 @@ public class ChoosePicturesFragment extends PreferenceFragment
     private void restoreData() {
         // Restore and the albums the selection
         mSelectedAlbums = new HashSet<String>(mOriginalSelectedAlbums);
-        int count = mAlbums.size();
+        int count = Math.min(mAlbums.size(), mOriginalAlbums.size());
         for (int i = 0; i < count ; i++) {
             Album album = mAlbums.get(i);
             Album originalAlbum = mOriginalAlbums.get(i);