diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index aac7053..d9de56d 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -24,6 +24,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
+import android.util.Log;
 import android.widget.Switch;
 import android.widget.Toast;
 
@@ -189,7 +190,16 @@
         MetricsLogger.action(mContext, MetricsEvent.ACTION_BLUETOOTH_TOGGLE, isChecked);
 
         if (mLocalAdapter != null) {
-            mLocalAdapter.setBluetoothEnabled(isChecked);
+            boolean status = mLocalAdapter.setBluetoothEnabled(isChecked);
+            // If we cannot toggle it ON then reset the UI assets:
+            // a) The switch should be OFF but it should still be togglable (enabled = True)
+            // b) The switch bar should have OFF text.
+            if (isChecked && !status) {
+                switchView.setChecked(false);
+                mSwitch.setEnabled(true);
+                mSwitchBar.setTextViewLabel(false);
+                return;
+            }
         }
         mSwitch.setEnabled(false);
     }
