diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index fa5f89e72..e3c147320 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2176,7 +2176,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                     } else {
                         filteredOptions = options.stream().filter(o -> o.toString().replaceAll("\\W", "").toLowerCase().contains(q)).collect(Collectors.toList());
                     }
-                    adapter = new ArrayAdapter(binding.getRoot().getContext(), R.layout.simple_list_item_selectable_text, filteredOptions);
+                    adapter = new ArrayAdapter(binding.getRoot().getContext(), R.layout.simple_list_item, filteredOptions);
                     binding.list.setAdapter(adapter);
 
                     int checkedPos = filteredOptions.indexOf(new Option(mValue.getContent(), ""));
@@ -2715,7 +2715,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 protected Context ctx;
 
                 public ActionsAdapter(Context ctx) {
-                    super(ctx, R.layout.simple_list_item_selectable_text);
+                    super(ctx, R.layout.simple_list_item);
                     this.ctx = ctx;
                 }
 
diff --git a/src/main/res/layout/command_row.xml b/src/main/res/layout/command_row.xml
index 9d42a7f54..4087e6c24 100644
--- a/src/main/res/layout/command_row.xml
+++ b/src/main/res/layout/command_row.xml
@@ -5,7 +5,6 @@
     android:id="@+id/command"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textIsSelectable="true"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:paddingLeft="@dimen/avatar_item_distance"