diff --git a/res/layout/device_profiles_settings.xml b/res/layout/device_profiles_settings.xml
index 0f8438500f7..87b85000d53 100644
--- a/res/layout/device_profiles_settings.xml
+++ b/res/layout/device_profiles_settings.xml
@@ -53,6 +53,7 @@
 
     <LinearLayout
         android:id="@+id/profiles_section"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 5dd70980b46..ae42e3d0c2f 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -154,6 +154,7 @@ public final class DeviceProfilesSettings extends DialogFragment implements
                 dismiss();
                 return;
             }
+            addPreferencesForProfiles();
             refresh();
         }
     }
@@ -169,16 +170,6 @@ public final class DeviceProfilesSettings extends DialogFragment implements
         mManager.setForegroundActivity(null);
     }
 
-    public void setDevice(CachedBluetoothDevice cachedDevice) {
-        mCachedDevice = cachedDevice;
-
-        if (isResumed()) {
-            mCachedDevice.registerCallback(this);
-            addPreferencesForProfiles();
-            refresh();
-        }
-    }
-
     private void addPreferencesForProfiles() {
         mProfileContainer.removeAllViews();
         for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {