diff --git a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
index c14c4fc96..2d671724d 100644
--- a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
+++ b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
@@ -2285,12 +2285,12 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
             mSelectedCount += selectedCountDelta;
         }
 
-        computeBatchDirection();
-        updateActionModeTitle();
-
         // make sure the onPrepareActionMode is called
         mActionMode.invalidate();
 
+        computeBatchDirection();
+        updateActionModeTitle();
+
         computeSelectAllVisibility();
 
         mAdapter.notifyDataSetChanged();