diff --git a/src/com/android/settings/search/CustomSiteMapRegistry.java b/src/com/android/settings/search/CustomSiteMapRegistry.java
index afda72b..f1c6211 100644
--- a/src/com/android/settings/search/CustomSiteMapRegistry.java
+++ b/src/com/android/settings/search/CustomSiteMapRegistry.java
@@ -24,6 +24,8 @@
 import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
 import com.android.settings.fuelgauge.PowerUsageAdvanced;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.GestureNavigationSettingsFragment;
+import com.android.settings.gestures.SystemNavigationGestureSettings;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.RecentLocationRequestSeeAllFragment;
 import com.android.settings.network.NetworkDashboardFragment;
@@ -63,5 +65,7 @@
                 SystemDashboardFragment.class.getName());
         CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(),
                 ZenModeRestrictNotificationsSettings.class.getName());
+        CUSTOM_SITE_MAP.put(GestureNavigationSettingsFragment.class.getName(),
+                SystemNavigationGestureSettings.class.getName());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
index a3e88d9..20f0716 100644
--- a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
+++ b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
@@ -24,6 +24,8 @@
 import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
 import com.android.settings.fuelgauge.PowerUsageAdvanced;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.GestureNavigationSettingsFragment;
+import com.android.settings.gestures.SystemNavigationGestureSettings;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.RecentLocationRequestSeeAllFragment;
 import com.android.settings.network.NetworkDashboardFragment;
@@ -94,4 +96,11 @@
                 ZenModeBlockedEffectsSettings.class.getName())).isEqualTo(
                 ZenModeRestrictNotificationsSettings.class.getName());
     }
+
+    @Test
+    public void shouldContainGestureNavigationSettingsFragmentPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                GestureNavigationSettingsFragment.class.getName())).isEqualTo(
+                SystemNavigationGestureSettings.class.getName());
+    }
 }