diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index a6989f0c23c..ad0ba56d43e 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -33,6 +33,7 @@ import android.widget.Toast;
 
 import com.android.settings.R;
 import com.android.settings.WirelessSettings;
+import com.android.settings.search.Index;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -136,6 +137,7 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener  {
             case WifiManager.WIFI_STATE_ENABLED:
                 setSwitchChecked(true);
                 mSwitch.setEnabled(true);
+                updateSearchIndex(true);
                 break;
             case WifiManager.WIFI_STATE_DISABLING:
                 mSwitch.setEnabled(false);
@@ -143,14 +145,20 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener  {
             case WifiManager.WIFI_STATE_DISABLED:
                 setSwitchChecked(false);
                 mSwitch.setEnabled(true);
+                updateSearchIndex(false);
                 break;
             default:
                 setSwitchChecked(false);
                 mSwitch.setEnabled(true);
-                break;
+                updateSearchIndex(false);
         }
     }
 
+    private void updateSearchIndex(boolean isWiFiOn) {
+        Index.getInstance(mContext).updateFromClassNameResource(
+                WifiSettings.class.getName(), isWiFiOn);
+    }
+
     private void setSwitchChecked(boolean checked) {
         if (checked != mSwitch.isChecked()) {
             mStateMachineEvent = true;
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index c911ead378b..667feb3ec13 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -1195,6 +1195,7 @@ public class WifiSettings extends RestrictedSettingsFragment
                     data = new SearchIndexableRaw(context);
                     data.title = accessPoint.getTitle().toString();
                     data.screenTitle = res.getString(R.string.wifi_settings);
+                    data.enabled = enabled;
                     result.add(data);
                 }