diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index cf4a3adab91..87f23056a0c 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -201,7 +201,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
         List<CandidateInfoExtra> candidates = new ArrayList<>();
 
         if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
-                NAV_BAR_MODE_GESTURAL_OVERLAY)) {
+                NAV_BAR_MODE_GESTURAL_OVERLAY)
+                && SystemNavigationPreferenceController.isGestureAvailable(c)) {
             candidates.add(new CandidateInfoExtra(
                     c.getText(R.string.edge_to_edge_navigation_title),
                     c.getText(R.string.edge_to_edge_navigation_summary),
@@ -344,7 +345,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return SystemNavigationPreferenceController.isGestureAvailable(context);
+                    return true;
                 }
 
                 @Override
@@ -354,7 +355,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
                     final List<SearchIndexableRaw> result = new ArrayList<>();
 
                     if (SystemNavigationPreferenceController.isOverlayPackageAvailable(context,
-                            NAV_BAR_MODE_GESTURAL_OVERLAY)) {
+                            NAV_BAR_MODE_GESTURAL_OVERLAY) &&
+                            SystemNavigationPreferenceController.isGestureAvailable(context)) {
                         SearchIndexableRaw data = new SearchIndexableRaw(context);
                         data.title = res.getString(R.string.edge_to_edge_navigation_title);
                         data.key = KEY_SYSTEM_NAV_GESTURAL;
diff --git a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
index 797c0c0f7b9..6c92bae6b54 100644
--- a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
+++ b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
@@ -42,7 +42,7 @@ public class SystemNavigationPreferenceController extends BasePreferenceControll
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return AVAILABLE;
     }
 
     @Override