diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3764b95bd8b..a56f4070e20 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -630,6 +630,10 @@
         <activity android:name="Settings$KeyboardLayoutPickerActivity"
                 android:label="@string/keyboard_layout_picker_title"
                 android:clearTaskOnLaunch="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.KEYBOARD_LAYOUT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />