diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 840a393..892d61f 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -797,10 +797,16 @@
             FingerprintManager fpm =
                     (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
             if (fpm.isHardwareDetected()) {
+                // This catches the title which can be overloaded in an overlay
                 data = new SearchIndexableRaw(context);
                 data.title = res.getString(R.string.security_settings_fingerprint_preference_title);
                 data.screenTitle = screenTitle;
                 result.add(data);
+                // Fallback for when the above doesn't contain "fingerprint"
+                data = new SearchIndexableRaw(context);
+                data.title = res.getString(R.string.fingerprint_manage_category_title);
+                data.screenTitle = screenTitle;
+                result.add(data);
             }
 
             // Credential storage
