diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index c37c9bb..e3a44b7 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -108,7 +108,11 @@
                 }
                 if (success) {
                     Log.d(TAG, "Successfully changed NFC enabled state to " + desiredState);
-                    // UI will be updated by BroadcastReceiver, above.
+                    mHandler.post(new Runnable() {
+                        public void run() {
+                            handleNfcStateChanged(desiredState);
+                        }
+                    });
                 } else {
                     Log.w(TAG, "Error setting NFC enabled state to " + desiredState);
                     mHandler.post(new Runnable() {
@@ -126,5 +130,6 @@
     private void handleNfcStateChanged(boolean newState) {
         mCheckbox.setChecked(newState);
         mCheckbox.setEnabled(true);
+        mCheckbox.setSummary(R.string.nfc_quick_toggle_summary);
     }
 }