diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 9561cb6..e667d67 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1468,10 +1468,8 @@
                 newtab.setEnabled(getTabControl().canCreateNewTab());
 
                 MenuItem archive = menu.findItem(R.id.save_webarchive_menu_id);
-                String url = getCurrentTopWebView().getUrl();
-                archive.setVisible(!TextUtils.isEmpty(url)
-                        && !url.endsWith("webarchivexml"));
-
+                String url = w != null ? w.getUrl() : null;
+                archive.setVisible(url != null && !url.endsWith(".webarchivexml"));
                 break;
         }
         mCurrentMenuState = mMenuState;