diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index a602857c7..ae82b7275 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -107,6 +107,11 @@ public class ConversationListFragment extends SherlockListFragment
       } else {
         ConversationListAdapter adapter = (ConversationListAdapter)getListAdapter();
         adapter.toggleThreadInBatchSet(headerView.getThreadId());
+
+        if (adapter.getBatchSelections().size() == 0) {
+          actionMode.finish();
+        }
+
         adapter.notifyDataSetChanged();
       }
     }