diff --git a/res/values/strings.xml b/res/values/strings.xml
index f308b99a706..18e6e67a5d9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1399,13 +1399,13 @@
     <string name="wifi_p2p_device_info">Device information</string>
     <string name="wifi_p2p_persist_network">Remember this connection</string>
     <!-- Menu option to discover peers-->
-    <string name="wifi_p2p_menu_search">SEARCH FOR DEVICES</string>
-    <!-- Menu option when discovery is in progress-->
-    <string name="wifi_p2p_menu_searching">SEARCHING</string>
+    <string name="wifi_p2p_menu_search">Search for devices</string>
+    <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+    <string name="wifi_p2p_menu_searching">Searching\u2026</string>
     <!-- Menu option to Rename-->
     <string name="wifi_p2p_menu_rename">Rename device</string>
     <!-- Title for available p2p devices -->
-    <string name="wifi_p2p_peer_devices">PEER DEVICES</string>
+    <string name="wifi_p2p_peer_devices">Peer devices</string>
     <!-- Toast text for a failed connection initiation -->
     <string name="wifi_p2p_failed_connect_message">Couldn\'t connect.</string>
     <!-- Title for disconnect dialog -->
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index a823ffaf783..b0f5c1039a9 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -161,6 +161,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
             }
         };
 
+        setHasOptionsMenu(true);
+
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         preferenceScreen.removeAll();
 
@@ -168,7 +170,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
         mThisDevicePref = new Preference(getActivity());
         preferenceScreen.addPreference(mThisDevicePref);
 
-        setHasOptionsMenu(true);
+        mPeersGroup = new PreferenceCategory(getActivity());
+        mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
     }
 
     @Override
@@ -310,11 +313,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
             preferenceScreen.removeAll();
 
             preferenceScreen.setOrderingAsAdded(true);
-            mThisDevicePref = new Preference(getActivity());
             preferenceScreen.addPreference(mThisDevicePref);
 
-            mPeersGroup = new PreferenceCategory(getActivity());
-            mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
             mPeersGroup.setEnabled(true);
             preferenceScreen.addPreference(mPeersGroup);