diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index ff5bf0d1e5..f30d596856 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -166,7 +166,7 @@
             android:label="@string/settings_button_text"
             android:theme="@style/HomeSettingsTheme"
             android:autoRemoveFromRecents="true">
-            <intent-filter>
+            <intent-filter android:priority="-1">
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml
index 7dc91ec354..bbedc68f53 100644
--- a/lawnchair/AndroidManifest.xml
+++ b/lawnchair/AndroidManifest.xml
@@ -24,7 +24,7 @@
         <activity android:name="ch.deletescape.lawnchair.settings.ui.SettingsActivity"
             android:autoRemoveFromRecents="true" android:label="@string/settings_button_text"
             android:theme="@style/HomeSettingsTheme">
-            <intent-filter android:priority="100">
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml
new file mode 100644
index 0000000000..a72065e2a6
--- /dev/null
+++ b/lawnchair/res/values/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="settings_fragment_name" translatable="false">ch.deletescape.lawnchair.settings.ui.SettingsActivity$LauncherSettingsFragment</string>
+</resources>
\ No newline at end of file