diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
old mode 100644
new mode 100755
index 9f56f32acc7..e18e48a2510
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -236,6 +236,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
             case BluetoothAdapter.STATE_ON:
                 preferenceScreen.removeAll();
                 preferenceScreen.setOrderingAsAdded(true);
+                mDevicePreferenceMap.clear();
 
                 // This device
                 if (mMyDevicePreference == null) {