diff --git a/Signal/src/view controllers/MessageComposeTableViewController.m b/Signal/src/view controllers/MessageComposeTableViewController.m
index 1950f5185..d78bbcf65 100644
--- a/Signal/src/view controllers/MessageComposeTableViewController.m	
+++ b/Signal/src/view controllers/MessageComposeTableViewController.m	
@@ -730,6 +730,7 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie
 }
 
 - (IBAction)closeAction:(id)sender {
+    [self.searchController setActive:NO];
     [self dismissViewControllerAnimated:YES completion:nil];
 }