diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 6cc5508..cec62b0 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -161,7 +161,7 @@
             if (serviceState == 1) {
                 mToggleAccessibilityCheckBox.setChecked(true);
                 if (savedInstanceState != null) {
-                    restoreInstanceStrate(savedInstanceState);
+                    restoreInstanceState(savedInstanceState);
                 }
             } else {
                 setAccessibilityServicePreferencesState(false);
@@ -200,7 +200,7 @@
     /**
      * Restores the instance state from <code>savedInstanceState</code>.
      */
-    private void restoreInstanceStrate(Bundle savedInstanceState) {
+    private void restoreInstanceState(Bundle savedInstanceState) {
         String key = savedInstanceState.getString(KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX);
         if (key != null) {
             Preference preference = findPreference(key);
@@ -230,6 +230,8 @@
             Preference pref = mAccessibilityServicesCategory.getPreference(i);
             pref.setEnabled(isEnabled);
         }
+
+        mToggleScriptInjectionCheckBox.setEnabled(isEnabled);
     }
 
     @Override
