diff --git a/android/app/src/main/java/github/tornaco/android/thanos/apps/PackageSetListActivity.java b/android/app/src/main/java/github/tornaco/android/thanos/apps/PackageSetListActivity.java
index b0bcdceef..b6dc8ba02 100644
--- a/android/app/src/main/java/github/tornaco/android/thanos/apps/PackageSetListActivity.java
+++ b/android/app/src/main/java/github/tornaco/android/thanos/apps/PackageSetListActivity.java
@@ -4,6 +4,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -15,7 +17,6 @@
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 import github.tornaco.android.thanos.R;
@@ -91,10 +92,21 @@ protected int getTitleRes() {
 
     @Override
     protected void onSetupFab(ExtendedFloatingActionButton fab) {
-        fab.setText(R.string.common_fab_title_add);
-        fab.setIconResource(R.drawable.module_common_ic_add_fill);
-        fab.show();
-        fab.setOnClickListener(v -> onRequestAddPackageSet());
+        fab.hide();
+    }
+
+    @Override
+    protected void onInflateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.pkg_set_list_menu, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (R.id.action_add == item.getItemId()) {
+            onRequestAddPackageSet();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     private void onRequestAddPackageSet() {
diff --git a/android/app/src/main/res/menu/pkg_set_list_menu.xml b/android/app/src/main/res/menu/pkg_set_list_menu.xml
new file mode 100755
index 000000000..07f62d449
--- /dev/null
+++ b/android/app/src/main/res/menu/pkg_set_list_menu.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/module_common_ic_search_2_line"
+        android:title="@string/common_menu_title_search"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_add"
+        android:icon="@drawable/module_common_ic_add_fill"
+        android:title="@string/common_fab_title_add"
+        app:showAsAction="ifRoom" />
+
+</menu>