diff --git a/packages/SystemUI/LMODroidManifest.xml b/packages/SystemUI/LMODroidManifest.xml
index f10bd0d8d5a8271d2aac56f772f7cd442eecfefb..2cb455a8b7930ee5bb735f60b454797bfdd89f8a 100644
--- a/packages/SystemUI/LMODroidManifest.xml
+++ b/packages/SystemUI/LMODroidManifest.xml
@@ -42,6 +42,20 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity-alias>
+        <activity-alias
+            android:name=".tuner.NavbarActivity"
+            android:targetActivity=".tuner.TunerActivity"
+            android:enabled="true"
+            android:icon="@drawable/tuner"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:label="@string/systemui_tuner_navbar_title"
+            android:process=":tuner"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.action.NAV_BAR_TUNER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
     </application>
 
 </manifest>
diff --git a/packages/SystemUI/res/values/lmodroid_strings.xml b/packages/SystemUI/res/values/lmodroid_strings.xml
index 0ada878cd403cf592c89eae913af901c4a25e6b6..e7da5cf19163a51ba0e98e67fa80f977c7f8af53 100644
--- a/packages/SystemUI/res/values/lmodroid_strings.xml
+++ b/packages/SystemUI/res/values/lmodroid_strings.xml
@@ -87,6 +87,9 @@
     <!-- Name of the VoWiFi status bar icon. -->
     <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
 
+    <!-- Navbar -->
+    <string name="systemui_tuner_navbar_title">Layout</string>
+
     <!-- WiFi standard numbering on statusbar -->
     <string name="status_bar_wifi_standard">Wi-Fi standard number</string>
 
diff --git a/packages/SystemUI/res/xml/nav_bar_tuner.xml b/packages/SystemUI/res/xml/nav_bar_tuner.xml
index 68e8fad1e24a86f2da24a14657731631a2f66d9b..ff423ca26bc895a030e2dcaea10e7cee2e58da5b 100644
--- a/packages/SystemUI/res/xml/nav_bar_tuner.xml
+++ b/packages/SystemUI/res/xml/nav_bar_tuner.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sysui="http://schemas.android.com/apk/res-auto"
-    android:title="@string/nav_bar">
+    android:title="@string/systemui_tuner_navbar_title">
 
     <com.android.systemui.tuner.RadioListPreference
         android:key="layout"
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
index 1796bf21afdda1b56692c5a350ec8045334f141a..642ea5807aa805e0d72f22db3316719c5b5d597e 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
@@ -64,6 +64,8 @@ public class TunerActivity extends CollapsingToolbarBaseActivity implements
                 fragment = new DemoModeFragment(mDemoModeController, mGlobalSettings);
             } else if ("com.android.settings.action.STATUS_BAR_TUNER".equals(action)) {
                 fragment = new StatusBarTuner();
+            } else if ("com.android.settings.action.NAV_BAR_TUNER".equals(action)) {
+                fragment = new NavBarTuner();
             } else {
                 fragment = new TunerFragment();
             }