diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index 1563a09..48ee9fe 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -146,7 +146,8 @@
             actionBar.setDisplayOptions(
                     stateCount == 1 ? 0 : ActionBar.DISPLAY_HOME_AS_UP,
                     ActionBar.DISPLAY_HOME_AS_UP);
-            actionBar.setHomeButtonEnabled(true);
+            actionBar.setHomeButtonEnabled(
+                    (actionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0);
         }
 
         activity.invalidateOptionsMenu();