diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 4b16ff49071..eca0ccafb46 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -56,8 +56,6 @@ public final class BluetoothDevicePreference extends Preference implements
 
     private AlertDialog mDisconnectDialog;
 
-    private View mView;
-
     public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
         super(context);
 
@@ -142,7 +140,6 @@ public final class BluetoothDevicePreference extends Preference implements
             }
         }
 
-        mView = view;
         super.onBindView(view);
     }
 
@@ -182,10 +179,7 @@ public final class BluetoothDevicePreference extends Preference implements
         int bondState = mCachedDevice.getBondState();
 
         if (mCachedDevice.isConnected()) {
-            if (mOnSettingsClickListener != null) {
-                mView.setTag(mCachedDevice);
-                mOnSettingsClickListener.onClick(mView);
-            }
+            askDisconnect();
         } else if (bondState == BluetoothDevice.BOND_BONDED) {
             mCachedDevice.connect(true);
         } else if (bondState == BluetoothDevice.BOND_NONE) {