diff --git a/app/src/main/res/menu/menu_app_list.xml b/app/src/main/res/menu/menu_app_list.xml
index f29c9d89..35c74cbb 100644
--- a/app/src/main/res/menu/menu_app_list.xml
+++ b/app/src/main/res/menu/menu_app_list.xml
@@ -25,8 +25,8 @@
         android:id="@+id/menu_search"
         android:actionViewClass="androidx.appcompat.widget.SearchView"
         android:icon="@drawable/ic_baseline_search_24"
-        android:showAsAction="always|collapseActionView"
-        tools:ignore="AlwaysShowAction" />
+        android:showAsAction="ifRoom|collapseActionView"
+        android:title="@android:string/search_go" />
 
     <item
         android:id="@+id/use_recommended"
diff --git a/app/src/main/res/menu/menu_modules.xml b/app/src/main/res/menu/menu_modules.xml
index 96ac92a5..4b8cbd3f 100644
--- a/app/src/main/res/menu/menu_modules.xml
+++ b/app/src/main/res/menu/menu_modules.xml
@@ -24,6 +24,7 @@
         android:id="@+id/menu_search"
         android:actionViewClass="androidx.appcompat.widget.SearchView"
         android:icon="@drawable/ic_baseline_search_24"
-        android:showAsAction="ifRoom|collapseActionView" />
+        android:showAsAction="ifRoom|collapseActionView"
+        android:title="@android:string/search_go" />
 
 </menu>
diff --git a/app/src/main/res/menu/menu_repo.xml b/app/src/main/res/menu/menu_repo.xml
index e7d3ec27..387c3444 100644
--- a/app/src/main/res/menu/menu_repo.xml
+++ b/app/src/main/res/menu/menu_repo.xml
@@ -25,8 +25,8 @@
         android:id="@+id/menu_search"
         android:actionViewClass="androidx.appcompat.widget.SearchView"
         android:icon="@drawable/ic_baseline_search_24"
-        android:showAsAction="always|collapseActionView"
-        tools:ignore="AlwaysShowAction" />
+        android:showAsAction="ifRoom|collapseActionView"
+        android:title="@android:string/search_go" />
 
     <item
         android:id="@+id/item_list_sort"