diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index d55d12f5a9..7ba0f4fb6f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -838,6 +838,11 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
   @Override
   public boolean onConversationLongClick(Conversation conversation) {
+    if (actionMode != null) {
+      onConversationClick(conversation);
+      return true;
+    }
+
     defaultAdapter.initializeBatchMode(true);
     defaultAdapter.toggleConversationInBatchSet(conversation);