diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
index d3dbf34b76..c02449b030 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -256,7 +256,7 @@ class ConversationListAdapter extends PagedListAdapter<Conversation, RecyclerVie
     }
   }
 
-  private static class HeaderViewHolder extends RecyclerView.ViewHolder {
+  static class HeaderViewHolder extends RecyclerView.ViewHolder {
     private TextView headerText;
 
     public HeaderViewHolder(@NonNull View itemView) {
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 2ca8fcc0ff..90c34d7551 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -1022,8 +1022,9 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
     @Override
     public int getSwipeDirs(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-      if (viewHolder.itemView instanceof ConversationListItemAction ||
-          actionMode != null                                        ||
+      if (viewHolder.itemView instanceof ConversationListItemAction      ||
+          viewHolder instanceof ConversationListAdapter.HeaderViewHolder ||
+          actionMode != null                                             ||
           activeAdapter == searchAdapter)
       {
         return 0;