diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index 5f35cde..bc56b55 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -211,11 +211,11 @@
                     return;
                 }
                 WallpaperTileInfo info = (WallpaperTileInfo) v.getTag();
-                if (mSelectedThumb != null) {
-                    mSelectedThumb.setSelected(false);
-                    mSelectedThumb = null;
-                }
                 if (info.isSelectable()) {
+                    if (mSelectedThumb != null) {
+                        mSelectedThumb.setSelected(false);
+                        mSelectedThumb = null;
+                    }
                     mSelectedThumb = v;
                     v.setSelected(true);
                 }
@@ -307,8 +307,10 @@
                 new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        WallpaperTileInfo info = (WallpaperTileInfo) mSelectedThumb.getTag();
-                        info.onSave(WallpaperPickerActivity.this);
+                        if (mSelectedThumb != null) {
+                            WallpaperTileInfo info = (WallpaperTileInfo) mSelectedThumb.getTag();
+                            info.onSave(WallpaperPickerActivity.this);
+                        }
                     }
                 });