diff --git a/Signal/src/ViewControllers/MediaTileViewController.swift b/Signal/src/ViewControllers/MediaTileViewController.swift
index b3462da81..10e0f8bec 100644
--- a/Signal/src/ViewControllers/MediaTileViewController.swift
+++ b/Signal/src/ViewControllers/MediaTileViewController.swift
@@ -482,6 +482,10 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa
 
     @objc
     func didCancelSelect(_ sender: Any) {
+        endSelectMode()
+    }
+
+    func endSelectMode() {
         isInBatchSelectMode = false
 
         guard let collectionView = self.collectionView else {
@@ -537,6 +541,7 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa
 
         let deleteAction = UIAlertAction(title: confirmationTitle, style: .destructive) { _ in
             mediaGalleryDataSource.delete(items: items)
+            self.endSelectMode()
         }
 
         let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)