diff --git a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
index afcd4c66194..a48b71f15fa 100644
--- a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
@@ -45,13 +45,16 @@ public class InvisibleToggleAccessibilityServicePreferenceFragment extends
     /**
      * {@inheritDoc}
      *
-     * Enables accessibility service only when user had allowed permission.
+     * Enables accessibility service only when user had allowed permission. Disables
+     * accessibility service when shortcutPreference is unchecked.
      */
     @Override
     public void onCheckboxClicked(ShortcutPreference preference) {
         super.onCheckboxClicked(preference);
-        AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName,
-                getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED));
+        boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED)
+                && preference.getChecked();
+
+        AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, enabled);
     }
 
     /**