3 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 7c93e9f..cafbafb 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1518,8 +1518,6 @@ public class Controller
         counter.setVisible(showDebugSettings);
         counter.setEnabled(showDebugSettings);
 
-        MenuItem saveSnapshot = menu.findItem(R.id.save_snapshot_menu_id);
-        saveSnapshot.setVisible(tab != null && !tab.isSnapshot());
         mUi.updateMenuState(tab, menu);
     }
 
diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index e6eed18..aa8b79f 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -121,6 +121,11 @@ public class NavigationBarBase extends LinearLayout implements OnClickListener,
             popup.getMenuInflater().inflate(R.menu.ua_switcher, menu);
             menu.findItem(R.id.ua_mobile_menu_id).setChecked(!desktop);
             menu.findItem(R.id.ua_desktop_menu_id).setChecked(desktop);
+            Tab tab = mUiController.getCurrentTab();
+            MenuItem saveSnapshot = menu.findItem(R.id.save_snapshot_menu_id);
+            saveSnapshot.setVisible(tab != null && !tab.isSnapshot());
+            MenuItem find = menu.findItem(R.id.find_menu_id);
+            find.setVisible(tab != null && !tab.isSnapshot());
             popup.setOnMenuItemClickListener(this);
             popup.show();
         }
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index f33dbef..7321267 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -180,10 +180,6 @@ public class PhoneUi extends BaseUi {
         if (nt != null) {
             nt.setVisible(mNavScreen == null);
         }
-        MenuItem find = menu.findItem(R.id.find_menu_id);
-        if (find != null) {
-            find.setVisible(((tab != null) && !tab.isSnapshot()));
-        }
         MenuItem abm = menu.findItem(R.id.add_bookmark_menu_id);
         if (abm != null) {
             abm.setVisible((tab != null) && !tab.isSnapshot());