1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index df61f89e2..69484be34 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -413,6 +413,7 @@ public class PhotoPage extends ActivityState implements
 
     private ImageView mEditButton;
     private void setupEditButton() {
+        if (mSecureAlbum != null) return;
         RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity)
                 .findViewById(mAppBridge != null ? R.id.content : R.id.gallery_root);
         if (galleryRoot == null) return;
@@ -434,6 +435,7 @@ public class PhotoPage extends ActivityState implements
     }
 
     private void cleanupEditButton() {
+        if (mEditButton == null) return;
         RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity)
                 .findViewById(mAppBridge != null ? R.id.content : R.id.gallery_root);
         if (galleryRoot == null) return;