2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index c61890c06..ed632ac30 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -202,7 +202,8 @@ public class AlbumSetPage extends ActivityState implements
     }
 
     private static boolean albumShouldOpenInFilmstrip(MediaSet album) {
-        return album.isCameraRoll() && album.getMediaItemCount() > 0;
+        int itemCount = album.getMediaItemCount();
+        return (album.isCameraRoll() && itemCount > 0) || itemCount == 1;
     }
 
     WeakReference<Toast> mEmptyAlbumToast = null;
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index d7f701ab5..7c7ac6d76 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -407,7 +407,7 @@ public class PhotoPage extends ActivityState implements
             updateCurrentPhoto(mediaItem);
         }
 
-        mPhotoView.setFilmMode(mStartInFilmstrip);
+        mPhotoView.setFilmMode(mStartInFilmstrip && mMediaSet.getMediaItemCount() > 1);
         setupEditButton();
     }