diff --git a/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java
index 179ed262a20..86ac713194f 100644
--- a/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java
@@ -21,6 +21,7 @@ import static android.provider.Settings.Secure.DOZE_TAP_SCREEN_GESTURE;
 import android.annotation.UserIdInt;
 import android.content.Context;
 import android.hardware.display.AmbientDisplayConfiguration;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.provider.Settings;
 
@@ -74,8 +75,10 @@ public class TapScreenGesturePreferenceController extends GesturePreferenceContr
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        return Settings.Secure.putInt(mContext.getContentResolver(), DOZE_TAP_SCREEN_GESTURE,
-                isChecked ? 1 : 0);
+        boolean success = Settings.Secure.putInt(mContext.getContentResolver(),
+                DOZE_TAP_SCREEN_GESTURE, isChecked ? 1 : 0);
+        SystemProperties.set("persist.sys.tap_gesture", isChecked ? "1" : "0");
+        return success;
     }
 
     private AmbientDisplayConfiguration getAmbientConfig() {