diff --git a/Signal/src/ViewControllers/MessageComposeTableViewController.m b/Signal/src/ViewControllers/MessageComposeTableViewController.m
index a8b77e435..2764a515b 100644
--- a/Signal/src/ViewControllers/MessageComposeTableViewController.m
+++ b/Signal/src/ViewControllers/MessageComposeTableViewController.m
@@ -783,6 +783,13 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie
     return 20;
 }
 
+#pragma mark - UIScrollViewDelegate
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    [self.searchController.searchBar resignFirstResponder];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END