diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 13f09c1..6f42d3d 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <ListPreference
+    <com.android.browser.preferences.NonformattingListPreference
         android:key="homepage_picker"
         android:entries="@array/pref_homepage_choices"
         android:entryValues="@array/pref_homepage_values"
diff --git a/src/com/android/browser/preferences/NonformattingListPreference.java b/src/com/android/browser/preferences/NonformattingListPreference.java
new file mode 100644
index 0000000..51b3231
--- /dev/null
+++ b/src/com/android/browser/preferences/NonformattingListPreference.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.browser.preferences;
+
+import android.content.Context;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+
+public class NonformattingListPreference extends ListPreference {
+
+    private CharSequence mSummary;
+
+    public NonformattingListPreference(Context context) {
+        super(context);
+    }
+
+    public NonformattingListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        mSummary = summary;
+        super.setSummary(summary);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (mSummary != null) {
+            return mSummary;
+        }
+        return super.getSummary();
+    }
+
+}