diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java
index 89e5963..6e1ea0a 100644
--- a/src/com/android/browser/WebsiteSettingsActivity.java
+++ b/src/com/android/browser/WebsiteSettingsActivity.java
@@ -321,6 +321,8 @@
             icon = (ImageView) view.findViewById(R.id.icon);
 
             if (mCurrentSite == null) {
+                setTitle(getString(R.string.pref_extras_website_settings));
+
                 Site site = getItem(position);
                 title.setText(site.getPrettyTitle());
                 subtitle.setText(site.getPrettyOrigin());
@@ -334,6 +336,7 @@
                 // so that we can get it in onItemClick()
                 view.setTag(site);
             } else {
+                setTitle(mCurrentSite.getPrettyTitle());
                 icon.setVisibility(View.GONE);
                 String origin = mCurrentSite.getOrigin();
                 switch (mCurrentSite.getFeatureByIndex(position)) {
