diff --git a/src/com/android/wallpaper/picker/CategoryFragment.java b/src/com/android/wallpaper/picker/CategoryFragment.java
index 51c4a07..cfb693e 100755
--- a/src/com/android/wallpaper/picker/CategoryFragment.java
+++ b/src/com/android/wallpaper/picker/CategoryFragment.java
@@ -189,7 +189,8 @@
                 // For live wallpaper, show its thumbnail when scrolling.
                 if (mWallpaperConnection != null && mWallpaperConnection.isEngineReady()
                         && mHomePreviewWallpaperInfo instanceof LiveWallpaperInfo) {
-                    if (positionOffset == 0.0f) {
+                    if (positionOffset == 0.0f || positionOffset == 1.0f
+                            || positionOffsetPixels == 0) {
                         // The page is not moved. Show live wallpaper.
                         mWallpaperSurface.setZOrderMediaOverlay(false);
                     } else {
@@ -200,7 +201,8 @@
 
                 if (mWallpaperConnection != null && mWallpaperConnection.isEngineReady()
                         && mLockPreviewWallpaperInfo instanceof LiveWallpaperInfo) {
-                    if (positionOffset == 0.0f) {
+                    if (positionOffset == 0.0f || positionOffset == 1.0f
+                            || positionOffsetPixels == 0) {
                         // The page is not moved. Show live wallpaper.
                         LiveTileOverlay.INSTANCE.attach(mLockscreenPreview.getOverlay());
                     } else {
