diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7fce1bbd7..ad500c2e8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -266,8 +266,6 @@
     <activity android:name=".LocalHelpActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <meta-data android:name="android.app.searchable"
-            android:resource="@xml/search_localhelp" />
     </activity>
 
     <activity android:name=".map.MapActivity" />
diff --git a/res/xml/search_localhelp.xml b/res/xml/search_localhelp.xml
deleted file mode 100644
index b4f16fd0e..000000000
--- a/res/xml/search_localhelp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/app_name"
-    android:includeInGlobalSearch="false" />
diff --git a/src/org/thoughtcrime/securesms/LocalHelpActivity.java b/src/org/thoughtcrime/securesms/LocalHelpActivity.java
index fe5fd6347..6ec18f869 100644
--- a/src/org/thoughtcrime/securesms/LocalHelpActivity.java
+++ b/src/org/thoughtcrime/securesms/LocalHelpActivity.java
@@ -14,14 +14,10 @@ import android.widget.Toast;
 
 import androidx.appcompat.widget.SearchView;
 
-import org.thoughtcrime.securesms.connect.ApplicationDcContext;
-import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
-import java.io.File;
 import java.io.InputStream;
-import java.util.Arrays;
 import java.util.Locale;
 
 public class LocalHelpActivity extends PassphraseRequiredActionBarActivity
@@ -113,6 +109,7 @@ public class LocalHelpActivity extends PassphraseRequiredActionBarActivity
         MenuItem searchItem = menu.findItem(R.id.menu_search_localhelp);
         SearchView searchView = (SearchView) searchItem.getActionView();
         searchView.setOnQueryTextListener(this);
+        searchView.setQueryHint(getString(R.string.search));
 
         super.onPrepareOptionsMenu(menu);
         return true;