diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 2375061..9fe224e 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -56,10 +56,7 @@
             new SettingsContentObserver(new Handler()) {
             @Override
                 public void onChange(boolean selfChange, Uri uri) {
-                    String settingValue = Settings.Secure.getString(getContentResolver(),
-                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-                    final boolean enabled = settingValue.contains(mComponentName.flattenToString());
-                    mSwitchBar.setCheckedInternal(enabled);
+                    updateSwitchBarToggleSwitch();
                 }
             };
 
@@ -70,6 +67,7 @@
     @Override
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
+        updateSwitchBarToggleSwitch();
         super.onResume();
     }
 
@@ -195,6 +193,13 @@
         }
     }
 
+    private void updateSwitchBarToggleSwitch() {
+        String settingValue = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        final boolean checked = settingValue.contains(mComponentName.flattenToString());
+        mSwitchBar.setCheckedInternal(checked);
+    }
+
     private View createEnableDialogContentView(AccessibilityServiceInfo info) {
         LayoutInflater inflater = (LayoutInflater) getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
